summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2005-07-30 23:46:05 +0000
committerSteve Arnold <nerdboy@gentoo.org>2005-07-30 23:46:05 +0000
commit47a8048c692602cc73bcb2ba82ff162034bf4c00 (patch)
tree30287ca8e57d7604aff5dc9c0f96837f1484fd38
parentNew version, need libconfuse, ~sparc and ~ppc64 keywords dropped. Requires ge... (diff)
downloadgentoo-2-47a8048c692602cc73bcb2ba82ff162034bf4c00.tar.gz
gentoo-2-47a8048c692602cc73bcb2ba82ff162034bf4c00.tar.bz2
gentoo-2-47a8048c692602cc73bcb2ba82ff162034bf4c00.zip
removed x86-specific libtool switch to take a stab at bug 100294
(Portage version: 2.0.51.22-r2)
-rw-r--r--sci-libs/gdal/ChangeLog8
-rw-r--r--sci-libs/gdal/Manifest6
-rw-r--r--sci-libs/gdal/files/digest-gdal-1.2.6-r2 (renamed from sci-libs/gdal/files/digest-gdal-1.2.6-r1)0
-rw-r--r--sci-libs/gdal/gdal-1.2.6-r2.ebuild (renamed from sci-libs/gdal/gdal-1.2.6-r1.ebuild)6
4 files changed, 13 insertions, 7 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 28cfa862c4c2..139475b795d4 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/gdal
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.6 2005/07/25 01:47:20 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.7 2005/07/30 23:46:05 nerdboy Exp $
+
+*gdal-1.2.6-r2 (30 Jul 2005)
+
+ 30 Jul 2005; Steve Arnold <nerdboy@gentoo.org> -gdal-1.2.6-r1.ebuild,
+ +gdal-1.2.6-r2.ebuild:
+ removed x86-specific libtool switch to take a stab at bug 100294
*gdal-1.2.6-r1 (25 Jul 2005)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index f4d312c020dd..da5e87087a98 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,6 @@
MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
-MD5 65341708a35446e9b1a48aad4c78ed02 ChangeLog 1270
+MD5 ea098cd449f625b8e40fa31f0d5f0713 gdal-1.2.6-r2.ebuild 3951
+MD5 812fdecc2c94fccfa02c7d6344ee66c8 ChangeLog 1465
MD5 cffffd06d2205813df3407b5a2fdc341 gdal-1.2.5-r1.ebuild 3209
-MD5 03f756733b653593ad30d6813d99992c gdal-1.2.6-r1.ebuild 4015
MD5 82ada11f44c42ddedbfa5426ad7991d2 files/digest-gdal-1.2.5-r1 63
-MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r1 63
+MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r2 63
diff --git a/sci-libs/gdal/files/digest-gdal-1.2.6-r1 b/sci-libs/gdal/files/digest-gdal-1.2.6-r2
index 9cfc52edf488..9cfc52edf488 100644
--- a/sci-libs/gdal/files/digest-gdal-1.2.6-r1
+++ b/sci-libs/gdal/files/digest-gdal-1.2.6-r2
diff --git a/sci-libs/gdal/gdal-1.2.6-r1.ebuild b/sci-libs/gdal/gdal-1.2.6-r2.ebuild
index 66d60fd0f8c0..f6f6c4d98aff 100644
--- a/sci-libs/gdal/gdal-1.2.6-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.2.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r1.ebuild,v 1.1 2005/07/25 01:47:20 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r2.ebuild,v 1.1 2005/07/30 23:46:05 nerdboy Exp $
inherit eutils libtool gnuconfig distutils
@@ -62,7 +62,7 @@ src_compile() {
# it doesn't work without ${D} (or with econf and einstall).
pkg_conf="--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal \
--enable-shared --with-gnu-ld --with-pic"
- [ "${ARCH}" = "x86" ] && pkg_conf="${pkg_conf} --without-libtool"
+
use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
$(use_with postgres pg) $(use_with fits cfitsio) \
$(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
@@ -106,7 +106,7 @@ src_compile() {
sed -i -e "s:hardcode_into_libs=yes:hardcode_into_libs=no:g" libtool
echo '#undef GDAL_PREFIX' >> port/cpl_config.h
echo '#define GDAL_PREFIX "/usr"' >> port/cpl_config.h
- make || die "make failed"
+ emake || die "emake failed"
}
src_install() {