diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2010-07-18 20:08:22 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2010-07-18 20:08:22 +0000 |
| commit | 8e28e384ba818213453f24dba82cc67197cdbab3 (patch) | |
| tree | b5ce4efda5f4b8999556e8464394909f7a587d14 /sci-libs | |
| parent | Introduce static-libs useflag. (diff) | |
| download | historical-8e28e384ba818213453f24dba82cc67197cdbab3.tar.gz historical-8e28e384ba818213453f24dba82cc67197cdbab3.tar.bz2 historical-8e28e384ba818213453f24dba82cc67197cdbab3.zip | |
Updated for a couple of minor/weird bugs (320237 and 325193).
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/gdal/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/gdal/Manifest | 4 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-1.6.3-r1.ebuild | 12 |
3 files changed, 16 insertions, 6 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index aabe4e1bed9e..447e011d8ee3 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,10 @@ # 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.90 2010/07/11 17:30:08 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.91 2010/07/18 20:08:22 nerdboy Exp $ + + 18 Jul 2010; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.3-r1.ebuild: + Updated for a couple of minor/weird bugs (320237 and 325193). Suspect + random cosmic ray-induced bit-rot on the second one... 11 Jul 2010; Raúl Porcel <armin76@gentoo.org> gdal-1.6.3-r1.ebuild: sparc stable wrt #315659 diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index c56feb25d9fa..066b598cd58a 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -20,8 +20,8 @@ EBUILD gdal-1.5.3.ebuild 6455 RMD160 76ab124ec71a6c68d7ea116a782701fbfdf3ba0d SH EBUILD gdal-1.6.0-r1.ebuild 6598 RMD160 d8fbea8dfe3b0c04b96fc1d0de53c50d8f4feb7a SHA1 65ab9497ad9e7f5d06a1c17a7ba8b79f956a756c SHA256 d9198f83e1176f0fb73a55f1d4d161576e31f03f6ee975c7597cd364e0f52377 EBUILD gdal-1.6.1.ebuild 6207 RMD160 bc770f30e3fc7a2730593301493e5131887f96cf SHA1 fa00e68b0db2889ff4f41485577c73aea4c1902d SHA256 f42f23039752836249fbd420e7be8d1261b31dd8f62189a38e0e6cb030deff93 EBUILD gdal-1.6.2.ebuild 6203 RMD160 caa9c6d1dae739c603cb2919d5a7b5db1b28d0d7 SHA1 38896d24f7c3656db8a97e3fee4ab72d07a0d920 SHA256 c4d1c50620b1ace080e9e6b741435dc943a8a7d065b46f9df70bda614bcfc738 -EBUILD gdal-1.6.3-r1.ebuild 6721 RMD160 4c1dd12748509d069d2c9d6190ffc72f8dbdc25b SHA1 062dd7d44b30e33af8e136a41d2869ae58cf27dc SHA256 e349bc59f18b464c431e52c5905cd904052406d55a7048c415d77b535077454e +EBUILD gdal-1.6.3-r1.ebuild 6953 RMD160 ebddd7e18664123f25311ab30c3a81ffbc8fbed0 SHA1 3e9f9ea851f0e1a818339249c1c7cc03f2f6ce41 SHA256 e0203d2a2e49adcb982c4cdc05520816af0e5ebd7a15edfb55275f4ec86e189f EBUILD gdal-1.6.3.ebuild 6367 RMD160 59ed9586e72af81c706f531ae5aac4e5e9204aba SHA1 be5691f97c876f0445f92598af24caf0348b558d SHA256 8790e3ffcc862e5484f6d94bfb7692a61f9bfea4ba743d4bb48c43c233de8036 EBUILD gdal-1.7.1-r1.ebuild 7451 RMD160 52f641bb8f071b89cc735f10b88ec238ad3d3376 SHA1 3cdbf9facf1f1cb7aec01663741c8cb261fc5b2b SHA256 9fbda91f15606d33a0fcd2e421925b965800e78bcde3f15816965b2edb6202cd -MISC ChangeLog 16999 RMD160 945c77f5c68994ad524ace7f58bb6ee4eb5241cd SHA1 b6253e00e4e6aa472a7479312be8aaf191053bb2 SHA256 82cf483383b808b3dc4b5ee11ec5c04224d90c8b998dc7afaf45630539d3a970 +MISC ChangeLog 17201 RMD160 2c5bf9ad528a816818cc4dec101216c8c948a5c9 SHA1 115404761877160f14bc20614323b127ac2e8c91 SHA256 cac7d0a2c45b2dcb726847c5910edb92a33dfa6c9a7229a5d9d80ab56e6a9273 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3 diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild index 100bbd6491ab..ac6ef2f6af3f 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-2010 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.10 2010/07/11 17:30:08 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.11 2010/07/18 20:08:22 nerdboy Exp $ EAPI="3" WANT_AUTOCONF="2.5" @@ -101,14 +101,14 @@ src_configure() { elif useq hdf && ! useq netcdf; then use_conf="--with-netcdf=no --with-hdf4" else - $(use_with netcdf) + use_conf="$(use_with netcdf)" fi use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \ $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \ $(use_with postgres pg) $(use_with python) $(use_with ruby) \ $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \ - $(use_with sqlite sqlite3 ="${EPREFIX}"/usr) $(use_with geos) \ + $(use_with sqlite sqlite3 =${EPREFIX}/usr) $(use_with geos) \ $(use_with jpeg2k jasper) $(use_with odbc) $(use_enable debug)" # It can't find this @@ -136,6 +136,12 @@ src_configure() { GDALmake.opt.in || die "sed gdalmake.opt failed" econf ${pkg_conf} ${use_conf} || die "econf failed" + + # mysql-config puts this in (and boy is it a PITA to get it out) + sed \ + -i -r -e '/^LDFLAGS/ s/(-(Wl|O1),|,-(Wl|O1))//g' \ + -i -e '/^MYSQL_LIB/ s:-Wl,-O1 -rdynamic::' \ + GDALmake.opt || die "sed LIBS failed" } src_compile() { |