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 8dfc65616f7a412fefc598c9b6d9cd34812ef0c1
Author: Jim Jagielski <[email protected]>
AuthorDate: Thu Aug 6 13:41:38 2026 -0400

    RepositoryExternal.mk: link libxml2's static-lib private deps on macOS
    
    A static archive doesn't record its transitive deps the way a dylib
    does. libxml-2.0.pc's own "Libs.private: -lpthread -liconv -lm" says
    what's actually needed; add it explicitly.
---
 main/RepositoryExternal.mk | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/RepositoryExternal.mk b/main/RepositoryExternal.mk
index f52ceef24c..523065187d 100644
--- a/main/RepositoryExternal.mk
+++ b/main/RepositoryExternal.mk
@@ -156,15 +156,14 @@ 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.
+# Bundled libxml2 builds as a static archive on macOS 
(main/libxml2/makefile.mk),
+# not a dylib, so it can't be a PLAINLIB like the else-branch below. A static
+# archive carries no transitive deps, so its own libxml-2.0.pc's
+# "Libs.private: -lpthread -liconv -lm" must be added explicitly.
 define gb_LinkTarget__use_libxml2
 $(call gb_LinkTarget_add_libs,$(1),\
        $(OUTDIR)/lib/libxml2.a \
+       -lpthread -liconv -lm \
 )
 endef
 

Reply via email to