Kaydet (Commit) 824e663c authored tarafından Andras Timar's avatar Andras Timar

libetonyek bundled soname patch

Change-Id: Ib9ca5d65a493db7daa094b0dea3613637c4c184b
Reviewed-on: https://gerrit.libreoffice.org/17567Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
üst 27ba1e31
...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetony ...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetony
else ifeq ($(OS),WNT) 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)) $(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.dll,src/lib/.libs/libetonyek-0.1.dll))
else ifeq ($(DISABLE_DYNLOADING),) else ifeq ($(DISABLE_DYNLOADING),)
$(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 endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -22,6 +22,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ ...@@ -22,6 +22,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1 \ 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) ifeq ($(COM_GCC_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),) ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
......
--- 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment