Jan-Marek Glogowski
26603bc9ef
While this fixes the build with --enable-wasm-exceptions, the
resulting binary generates an "indirect call signature mismatch",
which doesn't happen with the non-NEH build.
The Chrome DWARF backtrace points to CallbackTaskScheduling().
Further debugging reveals, it's actually the UpdateMinPeriod
call for the "desktop::Desktop m_firstRunTimer" Timer.
Disturbingly the debug dynamic_cast<Timer> at the start of the
job loop fails, and the fallback generic job output is
chosen, AKA:
info:vcl.schedule: 6516 0x3871618 i: 0 a: 1 p: 1 \
desktop::Desktop m_firstRunTimer
m_firstRunTimer is a Timer member in the Desktop class, so this
looks like some memory corruption or toolchain problem.
The size difference is more then 10% and it's supposed to be
faster too. FWIW the optimized link time is still high and needs
32GB+ memory compared to the 13GB non-optimized memory usage.
Change-Id: I06d37ecece09000fd3b72a73e7bf40f0b0f61457
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130216
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
129 lines
4.1 KiB
Makefile
129 lines
4.1 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,liborcus))
|
|
|
|
$(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
|
|
|
|
$(eval $(call gb_ExternalProject_use_externals,liborcus, \
|
|
boost_headers \
|
|
boost_filesystem \
|
|
boost_iostreams \
|
|
boost_system \
|
|
mdds_headers \
|
|
zlib \
|
|
))
|
|
|
|
$(eval $(call gb_ExternalProject_register_targets,liborcus,\
|
|
build \
|
|
))
|
|
|
|
# Must be built with debug GNU C++ library if --enable-dbgutil has
|
|
# caused the LO code to be built thus.
|
|
|
|
# The LIBS setting for Android is needed to get the orcus-xml-dump
|
|
# executable to build successfully. We obviously don't actually need
|
|
# that executable on Android, but we don't want to bother with
|
|
# patching out building it for Android.
|
|
|
|
#$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") CXXFLAGS+="$(BOOST_CXXFLAGS))
|
|
|
|
liborcus_LIBS=
|
|
ifneq ($(SYSTEM_ZLIB),)
|
|
liborcus_LIBS+=-lz
|
|
endif
|
|
ifneq ($(SYSTEM_BOOST),)
|
|
liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_FILESYSTEM_LIB)
|
|
else
|
|
liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams -lboost_filesystem
|
|
endif
|
|
ifeq ($(OS),ANDROID)
|
|
liborcus_LIBS+=$(gb_STDLIBS)
|
|
endif
|
|
|
|
liborcus_CPPCLAGS=$(CPPFLAGS)
|
|
ifeq ($(SYSTEM_ZLIB),)
|
|
liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
|
|
endif
|
|
#
|
|
# OSes that use the GNU C++ library need to use -D_GLIBCXX_DEBUG in
|
|
# sync with the rest of LibreOffice, i.e. depending on
|
|
# --enable-dbgutil. Note that although Android doesn't use the GNU C
|
|
# library (glibc), the NDK does offer the GNU C++ library as one of
|
|
# the C++ libraries available, and we use it.
|
|
#
|
|
liborcus_CPPFLAGS+=$(gb_COMPILERDEFS_STDLIB_DEBUG)
|
|
|
|
liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED
|
|
liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
|
|
ifeq ($(COM),MSC)
|
|
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
|
|
endif
|
|
ifeq ($(SYSTEM_BOOST),)
|
|
liborcus_CXXFLAGS+=${BOOST_CPPFLAGS}
|
|
else
|
|
liborcus_LDFLAGS+=$(BOOST_LDFLAGS)
|
|
endif
|
|
ifneq (,$(PTHREAD_LIBS))
|
|
liborcus_LDFLAGS+=$(PTHREAD_LIBS)
|
|
endif
|
|
|
|
ifeq ($(OS),LINUX)
|
|
liborcus_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN
|
|
endif
|
|
|
|
ifeq ($(ENABLE_GDB_INDEX),TRUE)
|
|
liborcus_LDFLAGS+=-Wl,--gdb-index
|
|
liborcus_CXXFLAGS+=-ggnu-pubnames
|
|
ifneq ($(USE_LD),)
|
|
liborcus_LDFLAGS += $(USE_LD)
|
|
endif
|
|
endif
|
|
|
|
$(call gb_ExternalProject_get_state_target,liborcus,build) :
|
|
$(call gb_Trace_StartRange,liborcus,EXTERNAL)
|
|
$(call gb_ExternalProject_run,build,\
|
|
$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
|
|
$(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \
|
|
$(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT)') \
|
|
$(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS) $(gb_EMSCRIPTEN_EXCEPT)') \
|
|
MDDS_CFLAGS='$(MDDS_CFLAGS)' \
|
|
MDDS_LIBS=' ' \
|
|
MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
|
|
--with-pic \
|
|
$(if $(DISABLE_DYNLOADING), \
|
|
--enable-static --disable-shared \
|
|
, \
|
|
--enable-shared --disable-static \
|
|
) \
|
|
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
|
|
--disable-spreadsheet-model \
|
|
--without-tools \
|
|
--disable-python \
|
|
--disable-werror \
|
|
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
|
|
$(if $(SYSTEM_BOOST),,\
|
|
--with-boost=$(WORKDIR)/UnpackedTarball/boost \
|
|
boost_cv_lib_iostreams=yes \
|
|
boost_cv_lib_system=yes \
|
|
boost_cv_lib_filesystem=yes \
|
|
) \
|
|
$(gb_CONFIGURE_PLATFORMS) \
|
|
&& $(if $(verbose),V=1) \
|
|
$(MAKE) \
|
|
$(if $(filter MACOSX,$(OS)),\
|
|
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
|
|
$(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.17.0.dylib \
|
|
$(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.17.0.dylib \
|
|
) \
|
|
)
|
|
$(call gb_Trace_EndRange,liborcus,EXTERNAL)
|
|
|
|
# vim: set noet sw=4 ts=4:
|