diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-26 18:11:29 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-26 18:11:29 +0000 |
| commit | 4d36da434b8f2b39e3ef3b7c06255f6299213e8e (patch) | |
| tree | e738f018de728539528b5165a87e4480dfe97da7 /sci-libs | |
| parent | Respect AR, and avoid running sed. (diff) | |
| download | gentoo-2-4d36da434b8f2b39e3ef3b7c06255f6299213e8e.tar.gz gentoo-2-4d36da434b8f2b39e3ef3b7c06255f6299213e8e.tar.bz2 gentoo-2-4d36da434b8f2b39e3ef3b7c06255f6299213e8e.zip | |
Fix build with swig-2.0 wrt bug 325725. Thanks to Juergen Rose <rose@rz.uni-potsdam.de> for reporting
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/geos/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/geos/files/3.2.0-swig2.0.patch | 24 | ||||
| -rw-r--r-- | sci-libs/geos/geos-3.2.0-r1.ebuild | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog index a1d2d10606f3..8220fba452e9 100644 --- a/sci-libs/geos/ChangeLog +++ b/sci-libs/geos/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/geos # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.44 2010/06/26 15:33:18 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.45 2010/06/26 18:11:29 xarthisius Exp $ + + 26 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> + +files/3.2.0-swig2.0.patch, geos-3.2.0-r1.ebuild: + Fix build with swig-2.0 wrt bug 325725. Thanks to Juergen Rose + <rose@rz.uni-potsdam.de> for reporting 26 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> geos-3.2.0-r1.ebuild: diff --git a/sci-libs/geos/files/3.2.0-swig2.0.patch b/sci-libs/geos/files/3.2.0-swig2.0.patch new file mode 100644 index 000000000000..ac0aaed0b225 --- /dev/null +++ b/sci-libs/geos/files/3.2.0-swig2.0.patch @@ -0,0 +1,24 @@ +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='' + diff --git a/sci-libs/geos/geos-3.2.0-r1.ebuild b/sci-libs/geos/geos-3.2.0-r1.ebuild index 57aaf2c12241..386acf97e0f5 100644 --- a/sci-libs/geos/geos-3.2.0-r1.ebuild +++ b/sci-libs/geos/geos-3.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.2 2010/06/26 15:33:18 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.3 2010/06/26 18:11:29 xarthisius Exp $ EAPI=2 @@ -32,7 +32,8 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PV}-multipy.patch + epatch "${FILESDIR}"/${PV}-multipy.patch \ + "${FILESDIR}"/${PV}-swig2.0.patch eautoreconf echo "#!/bin/bash" > py-compile } |