diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-19 19:27:55 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-19 19:27:55 +0000 |
| commit | 071889a8a30a0e987c90b0632818e1e3432be032 (patch) | |
| tree | e91b29755ffae0f9b1b512b4d33fd579c2b4f857 /sci-libs/gdal | |
| parent | Revert to ~ppc wrt #413831 pending on user request for stabilization (diff) | |
| download | gentoo-2-071889a8a30a0e987c90b0632818e1e3432be032.tar.gz gentoo-2-071889a8a30a0e987c90b0632818e1e3432be032.tar.bz2 gentoo-2-071889a8a30a0e987c90b0632818e1e3432be032.zip | |
Fix building with sys-libs/zlib >= 1.2.5.1-r1 (OF) wrt #413835, Comment #1
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-1.6.3-r1.ebuild | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index 241bbafd2d87..dc847d5ac8dd 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.121 2012/04/26 15:28:13 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.122 2012/05/19 19:27:55 ssuominen Exp $ + + 19 May 2012; Samuli Suominen <ssuominen@gentoo.org> gdal-1.6.3-r1.ebuild: + Fix building with sys-libs/zlib >= 1.2.5.1-r1 (OF) wrt #413835, Comment #1 26 Apr 2012; Justin Lecher <jlec@gentoo.org> gdal-1.6.3-r1.ebuild, gdal-1.8.1.ebuild, gdal-1.8.1-r1.ebuild: diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild index 31981badfd26..fc906ee170f0 100644 --- a/sci-libs/gdal/gdal-1.6.3-r1.ebuild +++ b/sci-libs/gdal/gdal-1.6.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.22 2012/04/26 15:28:13 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.23 2012/05/19 19:27:55 ssuominen Exp $ EAPI=3 @@ -24,7 +24,7 @@ IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf RDEPEND=" dev-libs/expat - media-libs/tiff + media-libs/tiff:0 sci-libs/libgeotiff sys-libs/zlib curl? ( net-misc/curl ) @@ -84,6 +84,9 @@ src_prepare() { [[ ${CHOST} == *-darwin* ]] \ && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch + + has_version '>=sys-libs/zlib-1.2.5.1-r1' && \ + sed -i -e '1i#define OF(x) x' port/cpl_minizip_ioapi.h || die } src_configure() { |