File soversion.diff of Package wxWidgets-3_0

Overview Repositories Revisions Requests Users Attributes Meta

File soversion.diff of Package wxWidgets-3_0 (Revision f15e29a33aa463982123bdfbd24aff38)

Currently displaying revision f15e29a33aa463982123bdfbd24aff38 , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-11-07 10:41:58.650412802 +0100

Because it is so easy to change the ABI with just one configure option,
explicitly mark our build with a vendor tag.
(We do the same in windows:mingw: where this issue is even more pressing.)

In addition, because wxWidgets changes the ABI midway (for example,
did so between 3.0.1 and 3.0.2) without changing the SONAME, we have
to do it. As we have a vendor suffix, no filename conflicts can occur.
At the same time, it allows us to simplify the filename.

Record of names used in openSUSE:
	wxWidgets 3.0.1: libwx_*-suse-3.0.so.0
	wxWidgets 3.0.2: libwx_*-suse.so.1 (and -suse-nostl.so.1)
	wxWidgets 3.2~:  libwx_*-suse.so.2
	wxWidgets 3.0.2: libwx_*-suse.so.3 (rebuild trigger)

Since SOVERLINUX does not support TWOSYMLINKS=0, patch and use
a bit on SOVERSOLARIS instead.
---
 Makefile.in               |    5 +++--
 build/aclocal/bakefile.m4 |    3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: wxWidgets-3.0.3/Makefile.in
===================================================================
--- wxWidgets-3.0.3.orig/Makefile.in
+++ wxWidgets-3.0.3/Makefile.in
@@ -2099,6 +2099,7 @@ LOCALE_MSW_LINGUAS =  it
 @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@	= _gcc$(COMPILER_VERSION)
+VENDORTAG = -$(VENDOR)
 @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_BUILD_debug@WXDEBUGFLAG = d
@@ -2110,7 +2111,7 @@ LOCALE_MSW_LINGUAS =  it
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
 @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
 @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 COND_wxUSE_REGEX_builtin___wxregex___depname = \
 	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -15205,7 +15206,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.3.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
Index: wxWidgets-3.0.3/build/aclocal/bakefile.m4
===================================================================
--- wxWidgets-3.0.3.orig/build/aclocal/bakefile.m4
+++ wxWidgets-3.0.3/build/aclocal/bakefile.m4
@@ -500,8 +500,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
             SONAME_FLAG="-Wl,-soname,"
         fi
         USE_SOVERSION=1
-        USE_SOVERLINUX=1
-        USE_SOTWOSYMLINKS=1
+        USE_SOVERSOLARIS=1
       ;;
 
       *-*-solaris2* )

Places

File soversion.diff of Package wxWidgets-3_0 (Revision f15e29a33aa463982123bdfbd24aff38)

Places