File serf-1.3.x-shlibver-soname.patch of Package libserf

Overview Repositories Revisions Requests Users Attributes Meta

File serf-1.3.x-shlibver-soname.patch of Package libserf (Revision f06954589984cbd7d2becb9083720c32)

Currently displaying revision f06954589984cbd7d2becb9083720c32 , Show latest

Date: 2013-09-09 17:19:46 +0100
Subject: Use for the shared library version string both MAJOR and MINOR version
Upstream: commited
References: http://code.google.com/p/serf/source/detail?r=2163 https://bugzilla.novell.com/show_bug.cgi?id=842941

------------------------------------------------------------------------
r2163 | lieven.govaerts | 2013-09-09 17:19:46 +0100 (Mon, 09 Sep 2013) | 15 lines
Changed paths:
   M /trunk/SConstruct

Use for the shared library version string both MAJOR and MINOR version. Remove
the Mac specific current_version and compatibility_version setter code in favor
of scons built-in support (even if that's slightly flawed by filling in both
options with the same version).

Note: this has as consequence on Mac that the current_version and 
compatibility_version option values change for the 1.3.x branch from 4.x.x to
1.x.0.

* SConstruct
  (SHLIBVERSION): Use major.minor version.
  (darwin/LINKFLAGS): Don't set the current_version and compatibility_version
      options. Scons already does this, and setting them twice doesn't work
      with older versions of gcc.

------------------------------------------------------------------------
---
 SConstruct |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Index: serf-1.3.1/SConstruct
===================================================================
--- serf-1.3.1.orig/SConstruct	2013-08-15 10:13:20.000000000 +0100
+++ serf-1.3.1/SConstruct	2013-09-28 00:02:58.000000000 +0100
@@ -204,9 +204,15 @@ thisdir = os.getcwd()
 libdir = '$LIBDIR'
 incdir = '$PREFIX/include/serf-$MAJOR'
 
-env['SHLIBVERSION']='${MINOR}.0.0'
+# This version string is used in the dynamic library name, and for Mac OS X also
+# for the current_version and compatibility_version options in the .dylib
+#
+# Unfortunately we can't set the .dylib compatibility_version option separately
+# from current_version, so don't use the PATCH level to avoid that build and
+# runtime patch levels have to be identical.
+env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
 
-LIBNAME = 'libserf-${MAJOR}'
+LIBNAME = 'libserf-%d' % (MAJOR,)
 if sys.platform != 'win32':
   LIBNAMESTATIC = LIBNAME
 else:
@@ -218,10 +224,6 @@ env.Append(RPATH=libdir,
 if sys.platform == 'darwin':
 #  linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
   env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
-  # 'man ld' says positive non-zero for the first number, so we add one.
-  # Mac's interpretation of compatibility is the same as our MINOR version.
-  env.Append(LINKFLAGS='-Wl,-compatibility_version,%d' % (MINOR+1,))
-  env.Append(LINKFLAGS='-Wl,-current_version,%d.%d' % (MINOR+1, PATCH,))
 
 if sys.platform != 'win32':
   ### gcc only. figure out appropriate test / better way to check these

Places

File serf-1.3.x-shlibver-soname.patch of Package libserf (Revision f06954589984cbd7d2becb9083720c32)

Places