strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgpg-error: use custom soname and symbol version

Browse source 
The hope is that this should allow both system's libgpg-error.so.0 and
LO's bundled libgpg-error-lo.so.0 to be loaded by soffice.bin without
unintended hilarity.

Change-Id: I94498097a847b9756de86051798cb4ce022f6c83
Reviewed-on: https://gerrit.libreoffice.org/67012
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Michael Stahl 2019-01-28 14:31:12 +01:00 committed by Thorsten Behrens
parent ade7cbbb01
commit 87873a682f
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/libgpg-error/ExternalPackage_libgpg-error.mk vendored
View file

@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX)
$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.22.0))
$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.22.0))
else ifeq ($(OS),MACOSX)

1
external/libgpg-error/UnpackedTarball_libgpg-error.mk vendored
View file

@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
external/libgpg-error/w32-build-fixes-4.patch \
external/libgpg-error/clang-cl.patch \
$(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
))
# vim: set noet sw=4 ts=4:

22
external/libgpg-error/libgpgerror-bundled-soname.patch.1 vendored Normal file
View file

@ -0,0 +1,22 @@
--- libgpg-error/src/Makefile.in.orig 2019-01-28 14:11:10.518425440 +0100
+++ libgpg-error/src/Makefile.in 2019-01-28 14:11:16.901414229 +0100
@@ -540,7 +540,7 @@
@HAVE_LD_VERSION_SCRIPT_TRUE@libgpg_error_vers_opt = -Wl,--version-script=$(srcdir)/gpg-error.vers
libgpg_error_la_LDFLAGS = \
$(no_undefined) $(export_symbols) $(libgpg_error_vers_opt) \
- $(extra_ltoptions) -version-info \
+ $(extra_ltoptions) -release lo -version-info \
@LIBGPG_ERROR_LT_CURRENT@:@LIBGPG_ERROR_LT_REVISION@:@LIBGPG_ERROR_LT_AGE@
libgpg_error_la_SOURCES = gettext.h $(arch_sources) \
--- libgpg-error/src/gpg-error.vers.orig 2019-01-28 14:08:11.413740011 +0100
+++ libgpg-error/src/gpg-error.vers 2019-01-28 14:08:34.172700037 +0100
@@ -20,7 +20,7 @@
# visibility.h and gpg-error.def.in as well.
-GPG_ERROR_1.0 {
+GPG_ERROR_LIBREOFFICE {
global:
gpg_strerror;
gpg_strerror_r;