diff options
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/gdal/Manifest | 15 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-1.5.0-install_name.patch | 45 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-1.6.3-r1.ebuild | 7 |
4 files changed, 58 insertions, 15 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index 9d8e097c4b66..601b99d199dd 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.74 2010/03/07 19:32:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.75 2010/03/09 13:24:22 grobian Exp $ + + 09 Mar 2010; Fabian Groffen <grobian@gentoo.org> + +files/gdal-1.5.0-install_name.patch, gdal-1.6.3-r1.ebuild: + Unbreak compilation on Darwin *gdal-1.6.3-r1 (07 Mar 2010) diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 0bfd3a25e33a..7a235950b3dd 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -1,7 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e +AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd AUX gdal-1.5.0-makefile.patch 894 RMD160 955b2ac69f6d8477cc26ae1321ddc0d92e88fb90 SHA1 02ee0ac5351c2c83a848f7f9db646dcc19937123 SHA256 cd40c5f77c9f5d2a78a880a83d09656eacfe3437e8be7bfb13559a5e3fd9ee58 AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 SHA1 8a98cc52bb1d74a1d45f72f8191cf322ee050682 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7 AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593 @@ -20,14 +18,7 @@ EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SH EBUILD gdal-1.6.0-r1.ebuild 6653 RMD160 271dc8fb8ac3b8941a008f5459fe5c9264060f51 SHA1 5f5d5179d95a9c69e888641276d5202f0061782c SHA256 ca12c8f828064b7a6a5340a97a495799d767df095a3fbe9db39e4e656ebf2142 EBUILD gdal-1.6.1.ebuild 6261 RMD160 6b4d7360e237785bfcefa449ea9d25d14c2787cf SHA1 fb1333c67f56a6f5a12c549ed18bdc502d3cd9f0 SHA256 5b9e0280223437d8dbcfc3fba4a40e74635d59e329fc579717393972a15f66a3 EBUILD gdal-1.6.2.ebuild 6258 RMD160 5a856ad8e38455c0a7acca0806f402b29720f5d1 SHA1 a749df11026604e81d3061f3be0e19e39895d4a0 SHA256 2e51a26f67ae3e1ace3911b3461586e5a95fd0b7f442b514d89ffa6619cd5aab -EBUILD gdal-1.6.3-r1.ebuild 6549 RMD160 6ae23c385a19d2010d2a7a7cc44c620aed76564a SHA1 e45b72b13ab9f6ff5a21f6d9d803ac5c991ff6ea SHA256 6ab1030831900d329b14d8ced154429ce20c77dd6e99d08ea47b1e1fa0fad77a +EBUILD gdal-1.6.3-r1.ebuild 6648 RMD160 be52cba7820e8a5b422de7f41c1abe2af956f85c SHA1 769769d5725f3f722193ee3815a1e5adbd1c9888 SHA256 0b662812237f148f8db6a951ee590afefc27059c3ad386d5f59f0c3a1ce92e63 EBUILD gdal-1.6.3.ebuild 6422 RMD160 cf47cde7626034a9b12f5edda669bb49b2640ca0 SHA1 e311209140f40a9ab70df9783c44fcd998045c55 SHA256 1a02068a8c9ba47f2bed2c17a2db4e846a599ae176ee34d8dc14535a9e1b519c -MISC ChangeLog 14656 RMD160 3bfb2a7d3a348ef9157fd59090a4740305223764 SHA1 7106d9ccb243343a614a0d91733d4de4dd77c380 SHA256 f3e7f292f710e7a563b7ef83e27d0b0067e5d4c653cb34c01b9090b10f2f6efa +MISC ChangeLog 14805 RMD160 41ec0e12bc881a1bda7e2d1bb3abd14b7dbfd910 SHA1 f24cf352292d0dd0fc28d8b03657165362b7f5d7 SHA256 11a8e88299776cf861cd2579ecec6dcab5455555a328454d7224b62059e03830 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuULyIACgkQgAnW8HDreRauyQCfQy9Cl3GhAN8aDIIhebm7398q -sH4AnAstxwLTOc0BapLmtb4x6wSTYo64 -=Mo6w ------END PGP SIGNATURE----- diff --git a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch b/sci-libs/gdal/files/gdal-1.5.0-install_name.patch new file mode 100644 index 000000000000..e17575267d6e --- /dev/null +++ b/sci-libs/gdal/files/gdal-1.5.0-install_name.patch @@ -0,0 +1,45 @@ +--- GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800 ++++ GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800 +@@ -97,6 +97,10 @@ + GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) + GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal + ++# for building without libtool ++GDAL_SLIB_SO_VER = $(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION) ++GDAL_SLIB_SONAME = -install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT) ++ + # Mac OS X Framework definition + MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ + +--- GNUmakefile.orig 2010-03-09 14:03:08 +0100 ++++ GNUmakefile 2010-03-09 14:05:29 +0100 +@@ -218,7 +218,7 @@ + + ifeq ($(HAVE_LD_SHARED),yes) + +-GDAL_SLIB_B = $(notdir $(GDAL_SLIB)) ++GDAL_SLIB_B = libgdal + + install-lib: + +@@ -226,14 +226,14 @@ + ifeq ($(MACOSX_FRAMEWORK),yes) + $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL + else +- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B) +- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) +- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER) +- $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER) ++ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).dylib ++ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib ++ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib ++ $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib + (cd $(DESTDIR)$(INST_LIB) ; \ +- ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)) ++ ln -s $(GDAL_SLIB_B).$(GDAL_VER).dylib $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib) + (cd $(DESTDIR)$(INST_LIB) ; \ +- ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B)) ++ ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib $(GDAL_SLIB_B).dylib) + endif + + else diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild index 76bfe4d8ee8f..b7a222f67897 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.2 2010/03/07 22:56:28 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.3 2010/03/09 13:24:22 grobian Exp $ EAPI="3" WANT_AUTOCONF="2.5" @@ -76,11 +76,14 @@ src_prepare() { eautoconf epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \ - "${FILESDIR}"/${PN}-1.5.0-soname.patch \ "${FILESDIR}"/${PN}-1.5.1-python-install.patch \ "${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \ "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch + [[ ${CHOST} == *-darwin* ]] \ + && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ + || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch + if useq hdf && useq netcdf; then ewarn "Netcdf and HDF4 are incompatible due to certain tools in" ewarn "common; HDF5 is now the preferred choice for HDF data." |