This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1a4f219db887e9c23713862151145273d01fdc96 Author: Jim Jagielski <[email protected]> AuthorDate: Tue Aug 4 08:31:27 2026 -0400 Link static libxml2.a instead of libxml2.dylib on macOS/arm64 and x86 (cherry picked from commit fa640925af79b5a9be7c879ba2bddbc09441b03a) --- main/forms/util/makefile.mk | 6 +++--- main/xmlsecurity/util/makefile.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/forms/util/makefile.mk b/main/forms/util/makefile.mk index f276f52fe6..d86e08b972 100644 --- a/main/forms/util/makefile.mk +++ b/main/forms/util/makefile.mk @@ -56,9 +56,9 @@ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) # plain "-lxml2" (as pulled in by LIBXML2LIB) resolves to that bundled # copy instead of the configured --with-system-libxml one, and it is # missing symbols (xmlXPathValuePush, xmlXPathValuePop) that xformsxpath -# needs. Link the intended libxml2 by absolute path so the search order -# can't shadow it. -FORMS_LIBXML2LIB:=$(shell xml2-config --prefix)/lib/libxml2.dylib +# needs. Link the intended libxml2 statically by absolute path so the +# search order can't shadow it and no dylib needs to be bundled. +FORMS_LIBXML2LIB:=$(shell xml2-config --prefix)/lib/libxml2.a .ELSE FORMS_LIBXML2LIB=$(LIBXML2LIB) .ENDIF diff --git a/main/xmlsecurity/util/makefile.mk b/main/xmlsecurity/util/makefile.mk index 1e329f8b87..ac0df884a2 100644 --- a/main/xmlsecurity/util/makefile.mk +++ b/main/xmlsecurity/util/makefile.mk @@ -125,9 +125,9 @@ SHL2STDLIBS+= $(NSS3LIB) $(NSPR4LIB) # plain "-lxml2" (as pulled in by NSSCRYPTOLIBS via LIBXML2LIB) resolves # to that bundled copy instead of the configured --with-system-libxml one, # and it is missing symbols (xmlCtxtPushInput, xmlXPathValuePush) that -# xmlsec1 needs. Link the intended libxml2 by absolute path so the -# search order can't shadow it. -XMLSECURITY_SYSTEM_LIBXML2:=$(shell xml2-config --prefix)/lib/libxml2.dylib +# xmlsec1 needs. Link the intended libxml2 statically by absolute path +# so the search order can't shadow it and no dylib needs to be bundled. +XMLSECURITY_SYSTEM_LIBXML2:=$(shell xml2-config --prefix)/lib/libxml2.a SHL2STDLIBS+= $(XMLSECLIB-NSS) $(XMLSECLIB) $(XMLSECURITY_SYSTEM_LIBXML2) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB) .ELSE SHL2STDLIBS+= $(NSSCRYPTOLIBS)
