diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-05-05 15:49:16 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-05-06 10:33:18 +0200 |
| commit | ddea172792d13516ff7e0dd43f1f78b74ade8914 (patch) | |
| tree | d874b4bec1023771f27ab29e6841cd273422df05 /external/libwps | |
| parent | tdf#113483: DOCX: fix encoding of bookmarks with non-ASCII letters (diff) | |
| download | core-ddea172792d13516ff7e0dd43f1f78b74ade8914.tar.gz core-ddea172792d13516ff7e0dd43f1f78b74ade8914.zip | |
enable gdb-index also for liborcus and libwps if possible
These are larger C++ libs and without gdb-index gdb takes a moment
to load such libs.
Change-Id: I555a629199f761060199a528415f7d5fbe9d9533
Reviewed-on: https://gerrit.libreoffice.org/71822
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'external/libwps')
| -rw-r--r-- | external/libwps/ExternalProject_libwps.mk | 23 | ||||
| -rw-r--r-- | external/libwps/UnpackedTarball_libwps.mk | 1 | ||||
| -rw-r--r-- | external/libwps/libtool.patch.0 | 11 |
3 files changed, 31 insertions, 4 deletions
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk index 9c6a5ea137b3..bb8a5d977b6e 100644 --- a/external/libwps/ExternalProject_libwps.mk +++ b/external/libwps/ExternalProject_libwps.mk @@ -25,6 +25,23 @@ libwps_CPPFLAGS+=-D_GLIBCXX_DEBUG endif endif +libwps_CXXFLAGS=$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) + +libwps_LDFLAGS= +ifeq ($(OS),LINUX) +ifeq ($(SYSTEM_REVENGE),) +libwps_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN +endif +endif + +ifeq ($(ENABLE_GDB_INDEX),TRUE) +libwps_LDFLAGS+=-Wl,--gdb-index +libwps_CXXFLAGS+=-ggnu-pubnames +ifneq ($(USE_LD),) +libwps_LDFLAGS += -fuse-ld=$(USE_LD) +endif +endif + $(call gb_ExternalProject_get_state_target,libwps,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ @@ -41,11 +58,9 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + $(if $(libwps_CXXFLAGS),CXXFLAGS='$(libwps_CXXFLAGS)') \ $(if $(libwps_CPPFLAGS),CPPFLAGS='$(libwps_CPPFLAGS)') \ - $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ - 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ - -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ + $(if $(libwps_LDFLAGS),LDFLAGS='$(libwps_LDFLAGS)') \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && $(MAKE) \ diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index b148db2f93d2..a383a2d12377 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwps)) $(eval $(call gb_UnpackedTarball_add_patches,libwps,\ $(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \ + external/libwps/libtool.patch.0 \ )) ifneq ($(OS),MACOSX) diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0 new file mode 100644 index 000000000000..d3989d79927d --- /dev/null +++ b/external/libwps/libtool.patch.0 @@ -0,0 +1,11 @@ +--- ltmain.sh.sav 2018-08-02 14:21:34.000000000 +0200 ++++ ltmain.sh 2019-05-05 22:04:15.433588776 +0200 +@@ -7277,7 +7277,7 @@ func_mode_link () + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -fsanitize=*) ++ -fsanitize=*|-fuse-ld=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" |