24032fea95
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 <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
56 lines
2.2 KiB
Makefile
56 lines
2.2 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_ExternalProject_ExternalProject,raptor))
|
|
|
|
$(eval $(call gb_ExternalProject_use_externals,raptor,\
|
|
icu \
|
|
libxml2 \
|
|
))
|
|
|
|
ifeq ($(SYSTEM_ICU),)
|
|
$(eval $(call gb_ExternalProject_use_package,raptor,icu_ure))
|
|
endif
|
|
|
|
$(eval $(call gb_ExternalProject_register_targets,raptor,\
|
|
build \
|
|
))
|
|
|
|
$(call gb_ExternalProject_get_state_target,raptor,build):
|
|
$(call gb_Trace_StartRange,raptor,EXTERNAL)
|
|
$(call gb_ExternalProject_run,build,\
|
|
$(if $(filter iOS,$(OS)),LIBS="-liconv") \
|
|
$(if $(filter -fsanitize=undefined,$(CC)),CC='$(CC) -fno-sanitize=function') \
|
|
CFLAGS="$(CFLAGS) \
|
|
$(call gb_ExternalProject_get_build_flags,raptor) \
|
|
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
|
|
$(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
|
|
LDFLAGS='$(strip \
|
|
$(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 \
|
|
--without-xslt-config \
|
|
$(gb_CONFIGURE_PLATFORMS) \
|
|
$(if $(CROSS_COMPILING),$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
|
|
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
|
|
$(if $(DISABLE_DYNLOADING), \
|
|
--enable-static --disable-shared \
|
|
, \
|
|
--enable-shared --disable-static \
|
|
) \
|
|
$(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(gb_UnpackedTarball_workdir)/libxml2/xml2-config) \
|
|
&& $(MAKE) \
|
|
)
|
|
$(call gb_Trace_EndRange,raptor,EXTERNAL)
|
|
|
|
# vim: set noet sw=4 ts=4:
|