[gentoo-commits] gentoo-x86 commit in sci-libs/geos/files: 3.2.0-swig2.0.patch

[Kacper Kowalik (xarthisius)]

xarthisius    10/06/26 18:11:30

  Added:                3.2.0-swig2.0.patch
  Log:
  Fix build with swig-2.0 wrt bug 325725. Thanks to Juergen Rose <rose@××××××××××××××.de> for reporting
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-libs/geos/files/3.2.0-swig2.0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/files/3.2.0-swig2.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/files/3.2.0-swig2.0.patch?rev=1.1&content-type=text/plain

Index: 3.2.0-swig2.0.patch
===================================================================
https://bugs.gentoo.org/325725

--- macros/ac_pkg_swig.m4
+++ macros/ac_pkg_swig.m4
@@ -25,4 +25,7 @@
 dnl @version 2004-09-20
 dnl @license GPLWithACException
+dnl
+dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
+dnl
 
 AC_DEFUN([AC_PROG_SWIG],[
@@ -68,7 +71,7 @@
                                 [available_patch=0]
                         fi
-                        if test $available_major -ne $required_major \
-                                -o $available_minor -ne $required_minor \
-                                -o $available_patch -lt $required_patch ; then
+			[required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch]`
+			[available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]`
+                        if test $available_full -lt $required_full; then
                                 AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
                                 SWIG=''