From 24032fea95e84111ad60da7a8401eb1672c5f10d Mon Sep 17 00:00:00 2001 From: Patrick Luby Date: Sat, 30 Nov 2024 15:34:58 -0500 Subject: [PATCH] tdf#164047 Don't include libicuuc in libraptor2-lo link list on macOS For some unkown reason (maybe due to the macOS two-level namespace?) including the $(ICU_LIBS) link flags causes a crash on startup in the macOS dynamic library loader on some versions of macOS running on Intel machines. LibreOffice 24.8.3 and earlier did not have this bug since libraptor2-lo was not linked against libicuuc. So, revert back to the LibreOffice 24.8.3 macOS build behavior. On macOS, libraptor2-lo still links successfully even without libicuuc and the bundled JavaScript HelloWorld macro still runs. So it appears that libraptor2-lo does not need any symbols in libicuuc or, if it does, libicuuc has already been loaded by the time libraptor2-lo is loaded. Change-Id: I2e09ce57b5f7aea631a522f5d33f3a4b1ebfd419 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177594 Tested-by: Jenkins Reviewed-by: Christian Lohmaier Reviewed-by: Patrick Luby --- external/redland/ExternalProject_raptor.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk index 259f87d2dc11..80fe12117be1 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -35,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): $(if $(filter LINUX FREEBSD,$(OS)),$(strip -Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN -Wl,-rpath-link,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER))) \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)))' \ CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(gb_EMSCRIPTEN_CPPFLAGS)" \ + ICU_LIBS='$(if $(filter-out MACOSX,$(OS)),$(ICU_LIBS))' \ $(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \ --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --without-www \