File soversion.diff of Package wxWidgets-3_2

Overview Repositories Revisions Requests Users Attributes Meta

File soversion.diff of Package wxWidgets-3_2 (Revision e78b3ed617c98f571f75902c77398115)

Currently displaying revision e78b3ed617c98f571f75902c77398115 , 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.

One needs to look at the diff between versions. If in doubt, just
always bump, specifically(!) the SO major.

---
 Makefile.in               |    5 +++--
 build/aclocal/bakefile.m4 |    3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: wxWidgets-3.2.5/Makefile.in
===================================================================
--- wxWidgets-3.2.5.orig/Makefile.in
+++ wxWidgets-3.2.5/Makefile.in
@@ -2225,6 +2225,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
 @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
@@ -2236,7 +2237,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
 @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)
@@ -13982,7 +13983,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.2.3.$(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).11.0.0
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
Index: wxWidgets-3.2.5/build/aclocal/bakefile.m4
===================================================================
--- wxWidgets-3.2.5.orig/build/aclocal/bakefile.m4
+++ wxWidgets-3.2.5/build/aclocal/bakefile.m4
@@ -408,8 +408,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_2 (Revision e78b3ed617c98f571f75902c77398115)

Places