diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-08-11 06:23:03 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-08-11 06:23:03 +0000 |
| commit | 88dcf7bcf0f89d7f6129f41f2290a3aca8caaa02 (patch) | |
| tree | d401fd6d76fdbf6f154a7c6e5d08366541b78851 /sci-libs | |
| parent | Remove old version. (diff) | |
| download | gentoo-2-88dcf7bcf0f89d7f6129f41f2290a3aca8caaa02.tar.gz gentoo-2-88dcf7bcf0f89d7f6129f41f2290a3aca8caaa02.tar.bz2 gentoo-2-88dcf7bcf0f89d7f6129f41f2290a3aca8caaa02.zip | |
Add back soname/install_name conditional patching for Darwin
(Portage version: 2.2.01.15553-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/gdal/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-1.7.2.ebuild | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index c65319931fbb..881942145e6f 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,10 +1,13 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.95 2010/08/08 17:12:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.96 2010/08/11 06:23:03 grobian Exp $ 08 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild: Disable paralel emake everywhere. + 08 Aug 2010; Fabian Groffen <grobian@gentoo.org> gdal-1.7.2.ebuild: + Add back soname/install_name conditional patching for Darwin + 31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild: Fix one too many : at sed line. Per bug #330515. diff --git a/sci-libs/gdal/gdal-1.7.2.ebuild b/sci-libs/gdal/gdal-1.7.2.ebuild index a427d860c4ab..60003c74dcd7 100644 --- a/sci-libs/gdal/gdal-1.7.2.ebuild +++ b/sci-libs/gdal/gdal-1.7.2.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/gdal/gdal-1.7.2.ebuild,v 1.4 2010/08/08 17:12:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.5 2010/08/11 06:23:03 grobian Exp $ EAPI="3" @@ -79,8 +79,12 @@ src_prepare() { -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \ swig/python/GNUmakefile || die - epatch "${FILESDIR}"/${PV}-ruby_cflags.patch \ - "${FILESDIR}"/${PN}-1.5.0-soname.patch + epatch "${FILESDIR}"/${PV}-ruby_cflags.patch + + # -soname is only accepted by GNU ld/ELF + [[ ${CHOST} == *-darwin* ]] \ + && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ + || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch eautoreconf } |