This is an automated email from the ASF dual-hosted git repository. ardovm pushed a commit to branch catalina in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit b64d32719982ae71bded5cf1c81cea72b0365692 Author: Arrigo Marchiori <[email protected]> AuthorDate: Sat Jul 17 14:57:19 2021 +0200 Include required standard headers Allow configure scripts to compile on macOS. --- ext_libraries/apr/apr-1.5.2-darwin19.6.patch | 106 +++++++++++++++++++++++++ ext_libraries/apr/makefile.mk | 4 + main/icu/icu-darwin.patch | 34 ++++++++ main/icu/makefile.mk | 4 + main/redland/raptor/makefile.mk | 1 + main/redland/raptor/raptor2-2.0.15.patch.macos | 10 +++ 6 files changed, 159 insertions(+) diff --git a/ext_libraries/apr/apr-1.5.2-darwin19.6.patch b/ext_libraries/apr/apr-1.5.2-darwin19.6.patch new file mode 100644 index 0000000..dbb3fe3 --- /dev/null +++ b/ext_libraries/apr/apr-1.5.2-darwin19.6.patch @@ -0,0 +1,106 @@ +--- misc/build/apr-1.5.2/configure 2015-04-25 08:04:18.000000000 -0400 ++++ misc/build/apr-1.5.2/configure 2021-07-02 15:40:06.000000000 -0400 +@@ -22256,6 +22256,7 @@ + #include <errno.h> + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + main() + { + char buf[1024]; +@@ -23550,6 +23551,7 @@ + /* end confdefs.h. */ + #include <stdio.h> + #include <sys/types.h> ++#include <stdlib.h> + #ifdef WIN32 + #define binmode "b" + #else +@@ -23785,6 +23787,7 @@ + /* end confdefs.h. */ + #include <stdio.h> + #include <sys/types.h> ++#include <stdlib.h> + #ifdef WIN32 + #define binmode "b" + #else +@@ -23848,6 +23851,7 @@ + /* end confdefs.h. */ + #include <stdio.h> + #include <stddef.h> ++#include <stdlib.h> + #ifdef WIN32 + #define binmode "b" + #else +@@ -23911,6 +23915,7 @@ + /* end confdefs.h. */ + #include <stdio.h> + #include <sys/types.h> ++#include <stdlib.h> + #ifdef WIN32 + #define binmode "b" + #else +@@ -24061,6 +24066,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdio.h> ++#include <stdlib.h> + $ac_includes_default + #ifdef WIN32 + #define binmode "b" +@@ -24349,6 +24355,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <sys/uio.h> ++#include <stdlib.h> + #ifdef WIN32 + #define binmode "b" + #else +@@ -24973,6 +24980,7 @@ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> ++#include <stdlib.h> + main() + { + struct rlimit limit; +@@ -25417,6 +25425,7 @@ + + #include <sys/types.h> + #include <pthread.h> ++#include <stdlib.h> + int main() + { + pthread_mutex_t mutex; +@@ -27143,6 +27152,7 @@ + /* end confdefs.h. */ + + #include <stdio.h> ++#include <stdlib.h> + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif +@@ -27992,6 +28002,7 @@ + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif ++#include <stdlib.h> + + int main(void) { + struct addrinfo hints, *ai; +@@ -28055,6 +28066,7 @@ + #ifdef HAVE_NETDB_H + #include <netdb.h> + #endif ++#include <stdlib.h> + + int main(void) { + if (EAI_ADDRFAMILY < 0) { +@@ -28116,6 +28128,7 @@ + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif ++#include <stdlib.h> + + int main(void) { + struct sockaddr_in sa; diff --git a/ext_libraries/apr/makefile.mk b/ext_libraries/apr/makefile.mk index c1e918f..2f2ac92 100644 --- a/ext_libraries/apr/makefile.mk +++ b/ext_libraries/apr/makefile.mk @@ -59,6 +59,10 @@ BUILD_ACTION=INCLUDE="$(INCLUDE);./include" USEMAK=1 nmake -f Makefile.win buil .ELSE +.IF "$(OS)"=="MACOSX" +PATCH_FILES+= $(TARFILE_NAME)-darwin19.6.patch +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure --prefix=$(OUTDIR) --includedir=$(OUTDIR)$/inc$/apr CONFIGURE_FLAGS= diff --git a/main/icu/icu-darwin.patch b/main/icu/icu-darwin.patch new file mode 100644 index 0000000..3255ab3 --- /dev/null +++ b/main/icu/icu-darwin.patch @@ -0,0 +1,34 @@ +--- misc/build/icu/source/configure 2009-01-15 02:46:50.000000000 -0500 ++++ misc/build/icu/source/configure 2021-07-10 16:01:04.000000000 -0400 +@@ -2326,6 +2326,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <stdlib.h> + $ac_declaration + int + main () +@@ -2687,6 +2688,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <stdlib.h> + $ac_declaration + int + main () +@@ -4988,6 +4990,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ctype.h> ++#include <stdlib.h> + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -5635,6 +5638,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <stdlib.h> + int + main () + { diff --git a/main/icu/makefile.mk b/main/icu/makefile.mk index 20c8180..e8f164c 100644 --- a/main/icu/makefile.mk +++ b/main/icu/makefile.mk @@ -44,6 +44,10 @@ TARFILE_ROOTDIR=icu PATCH_FILES=${TARFILE_NAME}.patch icu-mp.patch icu-win-layoutex.patch +.IF "$(OS)"=="MACOSX" +PATCH_FILES+=icu-darwin.patch +.ENDIF + # ADDITIONAL_FILES= .IF "$(GUI)"=="UNX" diff --git a/main/redland/raptor/makefile.mk b/main/redland/raptor/makefile.mk index acb8bfa..5291695 100644 --- a/main/redland/raptor/makefile.mk +++ b/main/redland/raptor/makefile.mk @@ -146,6 +146,7 @@ OUT2INC+=src/raptor.h src/raptor2.h src/raptor_config.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor2.dylib +OOO_PATCH_FILES+=$(TARFILE_NAME).patch.macos .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=src$/.libs$/*.a diff --git a/main/redland/raptor/raptor2-2.0.15.patch.macos b/main/redland/raptor/raptor2-2.0.15.patch.macos new file mode 100644 index 0000000..c5115d2 --- /dev/null +++ b/main/redland/raptor/raptor2-2.0.15.patch.macos @@ -0,0 +1,10 @@ +--- misc/build/raptor2-2.0.15/configure 2014-11-02 01:04:38.000000000 -0500 ++++ misc/build/raptor2-2.0.15/configure 2021-07-08 14:26:15.000000000 -0400 +@@ -13747,6 +13747,7 @@ + $as_echo_n "checking whether __FUNCTION__ is available... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#include <stdio.h> + int main() { printf(__FUNCTION__); } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then :
