diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-08-07 11:09:01 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-17 12:27:49 +0000 |
| commit | b0ea1d1f6779dabbfd89ac720de12d4cfe934cec (patch) | |
| tree | 19c5e39f67c93d45c25f48153332d2d6051df655 /external | |
| parent | 576d3ebd831d12538db704c6e05b6accf20026f6 (diff) | |
libmwaw bundled soname patch
Reviewed-on: https://gerrit.libreoffice.org/17568
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 0dc79f35aa3a373414c17f596ca4491a69083864)
Conflicts:
external/libmwaw/ExternalPackage_libmwaw.mk
Change-Id: Ibaba47be8aeefca7719d1ff335f551777130c6cd
Reviewed-on: https://gerrit.libreoffice.org/17800
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmwaw/ExternalPackage_libmwaw.mk | 2 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 8 | ||||
| -rw-r--r-- | external/libmwaw/libmwaw-bundled-soname.patch.0 | 14 |
3 files changed, 23 insertions, 1 deletions
diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk b/external/libmwaw/ExternalPackage_libmwaw.mk index 97a6e6d6e642..06342c2e217f 100644 --- a/external/libmwaw/ExternalPackage_libmwaw.mk +++ b/external/libmwaw/ExternalPackage_libmwaw.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3 else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.$(MWAW_VERSION_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3-lo.so.3,src/lib/.libs/libmwaw-0.3-lo.so.3.0.$(MWAW_VERSION_MICRO))) endif # vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index 7aeb99c60d05..7751b38fba9c 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -21,6 +21,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ endif endif +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ + external/libmwaw/libmwaw-bundled-soname.patch.0 \ +)) +endif +endif + ifeq ($(SYSTEM_REVENGE),) $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ external/libmwaw/rpath.patch \ diff --git a/external/libmwaw/libmwaw-bundled-soname.patch.0 b/external/libmwaw/libmwaw-bundled-soname.patch.0 new file mode 100644 index 000000000000..2abf77c74892 --- /dev/null +++ b/external/libmwaw/libmwaw-bundled-soname.patch.0 @@ -0,0 +1,14 @@ +--- src/lib/Makefile.in.orig 2015-08-07 14:04:47.646611627 +0200 ++++ src/lib/Makefile.in 2015-08-07 14:25:49.888589996 +0200 +@@ -418,8 +418,8 @@ + + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) + libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBMWAW_WIN32_RESOURCE@ +-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = @LIBMWAW_WIN32_RESOURCE@ +-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = @LIBMWAW_WIN32_RESOURCE@ ++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_SOURCES = \ + libmwaw_internal.cxx \ + libmwaw_internal.hxx \ + |