diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2006-07-01 05:04:47 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2006-07-01 05:04:47 +0000 |
| commit | 5c0f42d75e0b9672b8c2a5f8aa24839868ad76d2 (patch) | |
| tree | a2b39b3f98119b3d38150a40bfd2eb736443699e /sci-libs/netcdf | |
| parent | Depend on >=libprelude-0.9.9. Fixes bug 135188. Thanks to Eric Brown <eric.br... (diff) | |
| download | gentoo-2-5c0f42d75e0b9672b8c2a5f8aa24839868ad76d2.tar.gz gentoo-2-5c0f42d75e0b9672b8c2a5f8aa24839868ad76d2.tar.bz2 gentoo-2-5c0f42d75e0b9672b8c2a5f8aa24839868ad76d2.zip | |
updated fortran support logic and added src_test (bugs 133519 and 136182)
(Portage version: 2.1.1_pre1-r5)
Diffstat (limited to 'sci-libs/netcdf')
| -rw-r--r-- | sci-libs/netcdf/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/netcdf/netcdf-3.6.1.ebuild | 23 |
2 files changed, 24 insertions, 6 deletions
diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog index 7fbad544ce1c..7ab93ac811df 100644 --- a/sci-libs/netcdf/ChangeLog +++ b/sci-libs/netcdf/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/netcdf # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.19 2006/05/25 20:30:08 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.20 2006/07/01 05:04:47 nerdboy Exp $ + + 01 Jul 2006; Steve Arnold <nerdboy@gentoo.org> netcdf-3.6.1.ebuild: + Updated fortran support logic and added src_test (bugs 133519 and 136182). + This should hopefully take care of both bugs and should detect at least GNU + fortran (g77 and gfortran) and PGI fortran... 25 May 2006; Steve Arnold <nerdboy@gentoo.org> netcdf-3.6.1.ebuild: update fortran handling (bug 133519) diff --git a/sci-libs/netcdf/netcdf-3.6.1.ebuild b/sci-libs/netcdf/netcdf-3.6.1.ebuild index 1a8cb7102ea1..49b00b03e654 100644 --- a/sci-libs/netcdf/netcdf-3.6.1.ebuild +++ b/sci-libs/netcdf/netcdf-3.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.1.ebuild,v 1.2 2006/05/25 20:30:08 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.1.ebuild,v 1.3 2006/07/01 05:04:47 nerdboy Exp $ inherit fortran eutils @@ -15,12 +15,22 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" S="${WORKDIR}/${P}/src" -fortran_pkg_setup() { +pkg_setup() { if use fortran ; then - FORTRAN="g77 gfortran pgf90" - need_fortran "g77 gfortran pgf90" + if built_with_use sys-devel/gcc fortran ; then + FORTRAN="g77 gfortran" + need_fortran "g77 gfortran" + einfo "Configuring for GNU fortran..." + elif test -f `which pgf90` ; then + FORTRAN="pgf90" + need_fortran "pgf90" + einfo "Configuring for PGI fortran..." + else + ewarn "Can't find a usable fortran compiler." + die "Please adjust your use flags." + fi else - FORTRAN="" + FORTRAN="" fi } src_unpack() { @@ -42,6 +52,9 @@ src_compile() { econf ${myconf} || die "econf failed" make || die "make failed" +} + +src_test() { make test || die "make test failed" } |