diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2012-01-21 11:41:00 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-01-21 11:41:00 +0000 |
| commit | 4eb1b25921648711df3efbe9b086b81875cac9dd (patch) | |
| tree | 7e1626e0c43acee22b407d969225eaadf10524b8 /sci-libs/hdf | |
| parent | remove blockers to media-sound/minitube (diff) | |
| download | gentoo-2-4eb1b25921648711df3efbe9b086b81875cac9dd.tar.gz gentoo-2-4eb1b25921648711df3efbe9b086b81875cac9dd.tar.bz2 gentoo-2-4eb1b25921648711df3efbe9b086b81875cac9dd.zip | |
Fix szip configure logic, respect CC
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/hdf')
| -rw-r--r-- | sci-libs/hdf/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/hdf/files/4.2.6-autotools.patch | 32 | ||||
| -rw-r--r-- | sci-libs/hdf/hdf-4.2.6.ebuild | 7 |
3 files changed, 16 insertions, 31 deletions
diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog index b1d00ed040cc..96b8fe58c798 100644 --- a/sci-libs/hdf/ChangeLog +++ b/sci-libs/hdf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/hdf -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.22 2011/12/22 17:36:28 bicatali Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.23 2012/01/21 11:41:00 xarthisius Exp $ + + 21 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org> + files/4.2.6-autotools.patch, hdf-4.2.6.ebuild: + Fix szip configure logic, respect CC *hdf-4.2.6 (22 Dec 2011) diff --git a/sci-libs/hdf/files/4.2.6-autotools.patch b/sci-libs/hdf/files/4.2.6-autotools.patch index c3b8bb7112b7..67b0d279d8c5 100644 --- a/sci-libs/hdf/files/4.2.6-autotools.patch +++ b/sci-libs/hdf/files/4.2.6-autotools.patch @@ -1,6 +1,5 @@ -diff -Nur hdf-4.2.6.orig/configure.ac hdf-4.2.6/configure.ac ---- hdf-4.2.6.orig/configure.ac 2011-12-21 23:40:35.000000000 +0000 -+++ hdf-4.2.6/configure.ac 2011-12-22 00:36:53.000000000 +0000 +--- a/configure.ac ++++ b/configure.ac @@ -199,20 +199,6 @@ dnl Build static libraries by default. Furthermore, fortran shared libraries dnl are unsupported. Disallow a user from enabling both shared libraries and @@ -31,23 +30,6 @@ diff -Nur hdf-4.2.6.orig/configure.ac hdf-4.2.6/configure.ac AC_ARG_WITH([szlib], [AC_HELP_STRING([--with-szlib=DIR], [Use szlib library [default=no]])],, -@@ -445,14 +431,13 @@ - fi - - AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) -- -+ ;; -+esac - if test -z "$HAVE_SZIP"; then - AC_MSG_ERROR([couldn't find szlib library]) - else - USE_COMP_SZIP="yes" - fi -- ;; --esac - - dnl Check to see if SZIP has encoder - if test "X$HAVE_SZIP" = "Xyes"; then @@ -702,7 +687,7 @@ dnl ====================================================================== dnl Libtool initialization @@ -97,9 +79,8 @@ diff -Nur hdf-4.2.6.orig/configure.ac hdf-4.2.6/configure.ac dnl This part doesn't work yet since HDF4 config files do not contain -diff -Nur hdf-4.2.6.orig/hdf/test/fortestF.f hdf-4.2.6/hdf/test/fortestF.f ---- hdf-4.2.6.orig/hdf/test/fortestF.f 2011-12-21 23:40:35.000000000 +0000 -+++ hdf-4.2.6/hdf/test/fortestF.f 2011-12-21 23:47:04.000000000 +0000 +--- a/hdf/test/fortestF.f ++++ b/hdf/test/fortestF.f @@ -203,7 +203,7 @@ if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then @@ -109,9 +90,8 @@ diff -Nur hdf-4.2.6.orig/hdf/test/fortestF.f hdf-4.2.6/hdf/test/fortestF.f retcode = -1 return endif -diff -Nur hdf-4.2.6.orig/mfhdf/libsrc/Makefile.am hdf-4.2.6/mfhdf/libsrc/Makefile.am ---- hdf-4.2.6.orig/mfhdf/libsrc/Makefile.am 2011-12-21 23:40:35.000000000 +0000 -+++ hdf-4.2.6/mfhdf/libsrc/Makefile.am 2011-12-21 23:48:07.000000000 +0000 +--- a/mfhdf/libsrc/Makefile.am ++++ b/mfhdf/libsrc/Makefile.am @@ -32,10 +32,11 @@ else libmfhdf_la_SOURCES = $(CSOURCES) diff --git a/sci-libs/hdf/hdf-4.2.6.ebuild b/sci-libs/hdf/hdf-4.2.6.ebuild index e117743fa098..2940e2d4b45a 100644 --- a/sci-libs/hdf/hdf-4.2.6.ebuild +++ b/sci-libs/hdf/hdf-4.2.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.6.ebuild,v 1.1 2011/12/22 17:36:28 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.6.ebuild,v 1.2 2012/01/21 11:41:00 xarthisius Exp $ EAPI=4 inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic @@ -34,7 +34,8 @@ src_configure() { --disable-netcdf \ $(use_enable fortran) \ $(use_enable static-libs static) \ - $(use_with szip szlib) + $(use_with szip szlib) \ + CC="$(tc-getCC)" } src_install() { |