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 5dc0b13ddfba8aec6c47c1ee7411d38166b5fbad Author: Jim Jagielski <[email protected]> AuthorDate: Thu Aug 6 13:16:38 2026 -0400 RepositoryExternal.mk: link static libxml2/libxslt on macOS gbuild's !SYSTEM_LIBXML/!SYSTEM_LIBXSLT branches register a PLAINLIB expecting a dylib, but the bundled build produces a static .a on macOS. Link the archive by absolute path there instead. --- main/RepositoryExternal.mk | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/main/RepositoryExternal.mk b/main/RepositoryExternal.mk index 1d4d32be6f..f52ceef24c 100644 --- a/main/RepositoryExternal.mk +++ b/main/RepositoryExternal.mk @@ -154,6 +154,22 @@ endef else # !SYSTEM_LIBXML +ifeq ($(OS),MACOSX) + +# The bundled libxml2 builds as a static archive on macOS (see +# main/libxml2/makefile.mk), not a dylib, so it can't be registered as a +# PLAINLIB the way other platforms do below -- there is no libxml2.dylib +# for the solver to deliver. Link the static archive by absolute path +# instead; $(LIBXML_PREFIX) is empty here (it's only set when +# SYSTEM_LIBXML=YES), so this is the module's own delivered location. +define gb_LinkTarget__use_libxml2 +$(call gb_LinkTarget_add_libs,$(1),\ + $(OUTDIR)/lib/libxml2.a \ +) +endef + +else # !MACOSX + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ xml2 \ )) @@ -164,6 +180,8 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ ) endef +endif # MACOSX + endif # SYSTEM_LIBXML @@ -179,6 +197,19 @@ endef else # !SYSTEM_LIBXSLT +ifeq ($(OS),MACOSX) + +# Bundled libxslt/libexslt build as static archives on macOS (see +# main/libxslt/makefile.mk); link by absolute path, same as libxml2 above. +define gb_LinkTarget__use_libxslt +$(call gb_LinkTarget_add_libs,$(1),\ + $(OUTDIR)/lib/libxslt.a \ + $(OUTDIR)/lib/libexslt.a \ +) +endef + +else # !MACOSX + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ xslt \ )) @@ -189,6 +220,8 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ ) endef +endif # MACOSX + endif # SYSTEM_LIBXSLT
