File muparser-abiversion.diff of Package muparser

Overview Repositories Revisions Requests Users Attributes Meta

File muparser-abiversion.diff of Package muparser (Revision a428ad0571fd579e6e311b4afe27f440)

Currently displaying revision a428ad0571fd579e6e311b4afe27f440 , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2015-02-03 00:43:03.433735818 +0100

muparser broke the ABI between 2.2.3 and 2.2.4 by changing.
The abidiff(1) report from libabigail:

[C]'method std::size_t mu::ParserError::GetPos()' has some indirect sub-type changes:
    return type changed:
      entity changed from typedef std::size_t to int
        name changed from 'long unsigned int' to 'int'
        size changed from 64 to 32 bits
        alignment changed from 64 to 32 bits

Work around this messup by using the full version as unique SONAME.
---
 Makefile.in               |    6 +++---
 build/autoconf/aclocal.m4 |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

Index: muparser-2.2.4/Makefile.in
===================================================================
--- muparser-2.2.4.orig/Makefile.in
+++ muparser-2.2.4/Makefile.in
@@ -143,7 +143,7 @@ COND_WINDOWS_IMPLIB_1___muParser_dll___i
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__muParser_dll___targetsuf3 \
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .2.2.4.$(SO_SUFFIX)
 @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__muParser_dll___targetsuf3 \
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@	= .$(SO_SUFFIX).2
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@	= .$(SO_SUFFIX).2.2.6
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__muParser_dll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -2.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__muParser_dll___targetsuf3 = .$(SO_SUFFIX)
Index: muparser-2.2.4/build/autoconf/aclocal.m4
===================================================================
--- muparser-2.2.4.orig/build/autoconf/aclocal.m4
+++ muparser-2.2.4/build/autoconf/aclocal.m4
@@ -1317,8 +1317,9 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
             SONAME_FLAG="-Wl,-soname,"
         fi
         USE_SOVERSION=1
-        USE_SOVERLINUX=1
-        USE_SOTWOSYMLINKS=1
+        USE_SOVERLINUX=0
+        USE_SOVERSOLARIS=1
+        USE_SOTWOSYMLINKS=0
       ;;
 
       *-*-solaris2* )

Places

File muparser-abiversion.diff of Package muparser (Revision a428ad0571fd579e6e311b4afe27f440)

Places