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/liborcus | |
| parent | b9afb9959c31c3c57d0f2fe91107a92abfd82cdb (diff) | |
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/liborcus')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 8 | ||||
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 1 | ||||
| -rw-r--r-- | external/liborcus/libtool.patch.0 | 11 |
3 files changed, 20 insertions, 0 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index f1e82f54f4f7..8cc1c030fa98 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -82,6 +82,14 @@ 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 += -fuse-ld=$(USE_LD) +endif +endif + $(call gb_ExternalProject_get_state_target,liborcus,build) : $(call gb_ExternalProject_run,build,\ $(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \ diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 6814782bd9e2..e1d810a49dc2 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/rpath.patch.0 \ external/liborcus/gcc9.patch.0 \ external/liborcus/version.patch.0 \ + external/liborcus/libtool.patch.0 \ external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \ )) diff --git a/external/liborcus/libtool.patch.0 b/external/liborcus/libtool.patch.0 new file mode 100644 index 000000000000..93b677303374 --- /dev/null +++ b/external/liborcus/libtool.patch.0 @@ -0,0 +1,11 @@ +--- ltmain.sh.sav 2018-09-14 23:47:13.000000000 +0200 ++++ ltmain.sh 2019-05-05 23:11:30.406904472 +0200 +@@ -7278,7 +7278,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=*| \ +- -specs=*|-fsanitize=*) ++ -specs=*|-fsanitize=*|-fuse-ld=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" |