summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-11-03 20:54:13 +0200
committerTor Lillqvist <tml@collabora.com>2020-11-18 09:35:06 +0100
commitac9099140eeea974c9746528eeb96203d248d1e0 (patch)
treeb6ff2216d8378fe7ed55fcf83fb083dfa70f55c9 /external
parent33849071499df1c225d38de51452b13c0fde080e (diff)
Fix apr build with current Xcode: Include <stdlib.h> for exit()
(Or whatever it is that had broken it.) Change-Id: I72bc42e618f011518c05a2cdb875cfe64515b4d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105269 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106042 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'external')
-rw-r--r--external/apr/UnpackedTarball_apr.mk1
-rw-r--r--external/apr/exit.patch26
2 files changed, 27 insertions, 0 deletions
diff --git a/external/apr/UnpackedTarball_apr.mk b/external/apr/UnpackedTarball_apr.mk
index 5f82b8413d64..c3be6167024d 100644
--- a/external/apr/UnpackedTarball_apr.mk
+++ b/external/apr/UnpackedTarball_apr.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,apr,$(APR_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,apr,0))
$(eval $(call gb_UnpackedTarball_add_patches,apr, \
+ external/apr/exit.patch \
external/apr/uuid.patch \
))
diff --git a/external/apr/exit.patch b/external/apr/exit.patch
new file mode 100644
index 000000000000..5db6a94717cb
--- /dev/null
+++ b/external/apr/exit.patch
@@ -0,0 +1,26 @@
+--- configure
++++ configure
+@@ -23549,6 +23549,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #ifdef WIN32
+ #define binmode "b"
+@@ -23910,6 +23910,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #ifdef WIN32
+ #define binmode "b"
+@@ -24347,6 +24347,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
+ #ifdef WIN32