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 bf92e59e8d891a17f9b48767b3a99bcce7f68ffb Author: Jim Jagielski <[email protected]> AuthorDate: Thu Aug 6 06:26:28 2026 -0400 libxmlsec: pin xmlsec's libxml2 lookup to the configured prefix (cherry picked from commit 2df625d2e386264a0ff728f3d6558b620fbd6e2d) --- main/libxmlsec/makefile.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/main/libxmlsec/makefile.mk b/main/libxmlsec/makefile.mk index 99bdc616f2..a408c4211e 100644 --- a/main/libxmlsec/makefile.mk +++ b/main/libxmlsec/makefile.mk @@ -151,6 +151,23 @@ LDFLAGS:=$(xmlsec_LDFLAGS) CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" +# Pin xmlsec's libxml2 lookup to the prefix configure settled on. +# +# Without --with-libxml the AOO patches leave xmlsec resolving a bare +# "xml2-config" off $PATH, which on a Mac carrying MacPorts/Homebrew is +# often not the one --with-system-libxml named. The mis-pick is silent +# until link time: newer libxml2 renamed the stack helpers but kept the +# old spellings as macros (inputPush -> xmlCtxtPushInput, valuePush -> +# xmlXPathValuePush), so xmlsec 1.2.14 built against post-rename headers +# emits the new names and the older archive xmlsecurity links lacks them. +# Compile-side counterpart to the absolute-path link fix in +# xmlsecurity/util/makefile.mk and forms/util/makefile.mk; both are needed. +# +# Guarded on SYSTEM_LIBXML: the internal build already gets an +# absolute-path xml2-config, which AC_PATH_PROG honors as-is. +.IF "$(SYSTEM_LIBXML)"=="YES" && "$(LIBXML_PREFIX)"!="" +CONFIGURE_FLAGS+=--with-libxml=$(LIBXML_PREFIX) +.ENDIF # system-nss needs pkgconfig to get the information about nss # FIXME: This also will enable pkg-config usage for libxml2. It *seems* # that the internal headers still are used when they are there but....
