[Libreoffice-commits] core.git: external/apr

[Tor Lillqvist (via logerrit)]

 external/apr/UnpackedTarball_apr.mk |    1 +
 external/apr/exit.patch             |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

New commits:
commit 83510e43f2e6ede00a2889e9b691447e3869c133
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 3 20:54:13 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 4 09:53:58 2020 +0100

    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 at collabora.com>

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