diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-11-03 20:54:13 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-23 16:28:04 +0100 |
| commit | e69b07170882a2f258f6cada13cfdca4833e8239 (patch) | |
| tree | 1d0262f8bd5bddcbba77f65c9e284fe6a8bf8a73 | |
| parent | Clean up arm64 confusion a bit (diff) | |
| download | core-e69b07170882a2f258f6cada13cfdca4833e8239.tar.gz core-e69b07170882a2f258f6cada13cfdca4833e8239.zip | |
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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106372
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/apr/UnpackedTarball_apr.mk | 1 | ||||
| -rw-r--r-- | external/apr/exit.patch | 26 |
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 |