external/fontconfig/ExternalProject_fontconfig.mk | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit ebbb5d729600bff7695d8cac9769dda6e9038cfe Author: Jan Holesovsky <[email protected]> AuthorDate: Mon Mar 9 16:07:20 2026 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Mon Mar 9 17:53:25 2026 +0100 macOS: Fix fontconfig install_name after 38e8b08b9231 The commit 38e8b08b9231 ("tweak fontconfig configure to set pkgconfig include/lib dirs to build locations") added --libdir pointing to the workdir. This overrides --prefix=/@.__________________________________________________OOO that was previously used on macOS to derive the library's install_name, causing libvcllo.dylib to embed an absolute workdir path for fontconfig instead of @loader_path. Fix by calling install_name_tool after the build to set the correct install_name, matching the pattern used by cairo and pixman. Change-Id: I0f8c3a2e5d1b4a7c9e6f0d2b8a4c1e3f5d7b9a0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201295 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index 547f69881e6b..eb4b2c1a47fa 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -62,6 +62,12 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : ) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && $(MAKE) -C src && $(MAKE) fonts.conf \ + $(if $(filter MACOSX,$(OS)), \ + && install_name_tool -id @__________________________________________________OOO/libfontconfig.1.dylib \ + $(gb_UnpackedTarball_workdir)/fontconfig/src/.libs/libfontconfig.1.dylib \ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(gb_UnpackedTarball_workdir)/fontconfig/src/.libs/libfontconfig.1.dylib \ + ) \ ) $(call gb_Trace_EndRange,fontconfig,EXTERNAL)
