diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-08-07 10:57:36 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-17 12:27:32 +0000 |
| commit | 576d3ebd831d12538db704c6e05b6accf20026f6 (patch) | |
| tree | d0869ae9cdb9f5b6cb65c61fef5bb4ff515f7d81 /external | |
| parent | ea5763a7dea0cff7762ded5e103f7ae502eea737 (diff) | |
libetonyek bundled soname patch
Reviewed-on: https://gerrit.libreoffice.org/17567
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 824e663cfbba436db32e4f2a20e3acbe275252e7)
Conflicts:
external/libetonyek/ExternalPackage_libetonyek.mk
Change-Id: Ib9ca5d65a493db7daa094b0dea3613637c4c184b
Reviewed-on: https://gerrit.libreoffice.org/17799
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libetonyek/ExternalPackage_libetonyek.mk | 2 | ||||
| -rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 8 | ||||
| -rw-r--r-- | external/libetonyek/libetonyek-bundled-soname.patch.0 | 11 |
3 files changed, 20 insertions, 1 deletions
diff --git a/external/libetonyek/ExternalPackage_libetonyek.mk b/external/libetonyek/ExternalPackage_libetonyek.mk index 08f0a63b7040..9fbfff4dd355 100644 --- a/external/libetonyek/ExternalPackage_libetonyek.mk +++ b/external/libetonyek/ExternalPackage_libetonyek.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetony else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.dll,src/lib/.libs/libetonyek-0.1.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.so.1,src/lib/.libs/libetonyek-0.1.so.1.0.$(ETONYEK_VERSION_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1-lo.so.1,src/lib/.libs/libetonyek-0.1-lo.so.1.0.$(ETONYEK_VERSION_MICRO))) endif # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index dd536f81db58..7f0d653d9b7c 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -22,6 +22,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1 \ )) +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ + external/libetonyek/libetonyek-bundled-soname.patch.0 \ +)) +endif +endif + ifeq ($(COM_GCC_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \ diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 b/external/libetonyek/libetonyek-bundled-soname.patch.0 new file mode 100644 index 000000000000..301aa38c26c0 --- /dev/null +++ b/external/libetonyek/libetonyek-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-07 10:51:32.494810336 +0200 ++++ src/lib/Makefile.in 2015-08-07 10:51:55.493809942 +0200 +@@ -463,7 +463,7 @@ + + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = libetonyek_internal.la $(REVENGE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) @LIBETONYEK_WIN32_RESOURCE@ + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@ +-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \ + EtonyekDocument.cpp + |