This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit c46d036de4426f9a07612706d383be376a9967ef Author: Jim Jagielski <[email protected]> AuthorDate: Tue Aug 4 09:10:52 2026 -0400 Build bundled libxml2/libxslt as static libs on macOS Community builds should bundle static libraries rather than system dylibs. --- main/libxml2/makefile.mk | 8 +++++++- main/libxslt/makefile.mk | 11 +++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/main/libxml2/makefile.mk b/main/libxml2/makefile.mk index c7599060f0..056e3a852f 100644 --- a/main/libxml2/makefile.mk +++ b/main/libxml2/makefile.mk @@ -91,6 +91,12 @@ CONFIGURE_DIR= .IF "$(OS)"=="OS2" CONFIGURE_ACTION=sh .$/configure CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --without-lzma --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +.ELIF "$(OS)"=="MACOSX" +# Community builds bundle a static libxml2 rather than a dylib -- see +# main/xmlsecurity/util/makefile.mk and main/forms/util/makefile.mk for +# the consumer side of this. +CONFIGURE_ACTION=.$/configure +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --without-lzma --enable-static=yes --enable-shared=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ELSE CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --without-lzma --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" @@ -105,7 +111,7 @@ OUTDIR2INC=include$/libxml .IF "$(OS)"=="MACOSX" EXTRPATH=URELIB -OUT2LIB+=.libs$/libxml2.*.dylib +OUT2LIB+=.libs$/libxml2.a OUT2BIN+=.libs$/xmllint OUT2BIN+=xml2-config .ELIF "$(OS)"=="WNT" diff --git a/main/libxslt/makefile.mk b/main/libxslt/makefile.mk index dbdd13a4da..e97b870bfa 100644 --- a/main/libxslt/makefile.mk +++ b/main/libxslt/makefile.mk @@ -106,7 +106,14 @@ CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure +.IF "$(OS)"=="MACOSX" +# Community builds bundle a static libxslt/libexslt rather than a dylib -- +# see main/xmlsecurity/util/makefile.mk and main/forms/util/makefile.mk +# for the analogous libxml2 case. +CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=yes --enable-shared=no --with-sax1=yes ac_cv_func_clock_gettime=false +.ELSE CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes ac_cv_func_clock_gettime=false +.ENDIF BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -115,8 +122,8 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC=libxslt$/*.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib -OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib +OUT2LIB+=libxslt$/.libs$/libxslt.a +OUT2LIB+=libexslt$/.libs$/libexslt.a OUT2BIN+=xsltproc$/.libs$/xsltproc OUT2BIN+=xslt-config .ELIF "$(OS)"=="WNT"
