| 1 |
bicatali 10/12/01 17:02:07 |
| 2 |
|
| 3 |
Modified: ChangeLog libnc-dap-3.7.3-r1.ebuild |
| 4 |
Log: |
| 5 |
Remove use of fortran eclass |
| 6 |
|
| 7 |
(Portage version: 2.1.9.25/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 sci-libs/libnc-dap/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libnc-dap/ChangeLog?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libnc-dap/ChangeLog?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libnc-dap/ChangeLog?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/ChangeLog,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- ChangeLog 11 May 2009 03:50:00 -0000 1.4 |
| 23 |
+++ ChangeLog 1 Dec 2010 17:02:07 -0000 1.5 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-libs/libnc-dap |
| 26 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/ChangeLog,v 1.4 2009/05/11 03:50:00 nerdboy Exp $ |
| 28 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/ChangeLog,v 1.5 2010/12/01 17:02:07 bicatali Exp $ |
| 30 |
+ |
| 31 |
+ 01 Dec 2010; Sébastien Fabbro <bicatali@g.o> |
| 32 |
+ libnc-dap-3.7.3-r1.ebuild: |
| 33 |
+ Remove use of fortran eclass |
| 34 |
|
| 35 |
11 May 2009; Steve Arnold <nerdboy@g.o> libnc-dap-3.7.3-r1.ebuild: |
| 36 |
Updated to fix exported symbols with gfortran (one less underscore). Only |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.3 sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild?rev=1.3&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild?rev=1.3&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild?r1=1.2&r2=1.3 |
| 45 |
|
| 46 |
Index: libnc-dap-3.7.3-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild,v |
| 49 |
retrieving revision 1.2 |
| 50 |
retrieving revision 1.3 |
| 51 |
diff -u -r1.2 -r1.3 |
| 52 |
--- libnc-dap-3.7.3-r1.ebuild 11 May 2009 03:50:00 -0000 1.2 |
| 53 |
+++ libnc-dap-3.7.3-r1.ebuild 1 Dec 2010 17:02:07 -0000 1.3 |
| 54 |
@@ -1,8 +1,8 @@ |
| 55 |
-# Copyright 1999-2009 Gentoo Foundation |
| 56 |
+# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild,v 1.2 2009/05/11 03:50:00 nerdboy Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libnc-dap/libnc-dap-3.7.3-r1.ebuild,v 1.3 2010/12/01 17:02:07 bicatali Exp $ |
| 60 |
|
| 61 |
-inherit eutils flag-o-matic fortran |
| 62 |
+inherit eutils flag-o-matic toolchain-funcs |
| 63 |
|
| 64 |
DESCRIPTION="An OPeNDAP-enabled version of the NetCDF 3.6 API that replaces the standard NetCDF library." |
| 65 |
HOMEPAGE="http://opendap.org/index.html" |
| 66 |
@@ -24,19 +24,18 @@ |
| 67 |
|
| 68 |
pkg_setup() { |
| 69 |
if use fortran; then |
| 70 |
- fortran_pkg_setup |
| 71 |
- case "${FORTRANC}" in |
| 72 |
+ case "$(tc-getFC)" in |
| 73 |
# probably needs more compilers here, of which I have |
| 74 |
# none, so feel free to provide flags for others... |
| 75 |
- g77) |
| 76 |
+ *g77) |
| 77 |
export FCLAGS+="-finit-local-zero -fno-automatic \ |
| 78 |
- -fno-second-underscore -std=legacy -ff2c \ |
| 79 |
- -fall-intrinsics -static-libgfortran" |
| 80 |
+ -fno-second-underscore -std=legacy -ff2c \ |
| 81 |
+ -fall-intrinsics -static-libgfortran" |
| 82 |
;; |
| 83 |
*) |
| 84 |
export FCLAGS+="-finit-local-zero -fno-automatic \ |
| 85 |
- -fno-second-underscore -std=gnu \ |
| 86 |
- -fall-intrinsics -static-libgfortran" |
| 87 |
+ -fno-second-underscore -std=gnu \ |
| 88 |
+ -fall-intrinsics -static-libgfortran" |
| 89 |
;; |
| 90 |
esac |
| 91 |
else |
| 92 |
@@ -44,12 +43,12 @@ |
| 93 |
fi |
| 94 |
|
| 95 |
if use full-test; then |
| 96 |
- if [ -n "${DAP_TEST_OPTS}" ]; then |
| 97 |
+ if [ -n "${DAP_TEST_OPTS}" ]; then |
| 98 |
elog "User-specified test URL is ${DAP_TEST_OPTS}." |
| 99 |
- else |
| 100 |
+ else |
| 101 |
elog "User-specified test URL is not set; if needed, set" |
| 102 |
elog "DAP_TEST_OPTS to a URL of your choice and rebuild." |
| 103 |
- fi |
| 104 |
+ fi |
| 105 |
elog |
| 106 |
elog "The full regression test does two passes, the second one with" |
| 107 |
elog "remote data queries. The latter part can take several hours," |
| 108 |
@@ -63,16 +62,16 @@ |
| 109 |
cd "${S}" |
| 110 |
# increase the number of open netcdf files |
| 111 |
sed -i -e "s:MAX_NC_OPEN 32:MAX_NC_OPEN 128:g" \ |
| 112 |
- lnetcdf/{lnetcdf.h,netcdf.h} \ |
| 113 |
- || die "sed headers failed" |
| 114 |
+ lnetcdf/{lnetcdf.h,netcdf.h} \ |
| 115 |
+ || die "sed headers failed" |
| 116 |
|
| 117 |
# missing definition causes unknown symbol errors |
| 118 |
epatch "${FILESDIR}"/${P}_template-fix.patch |
| 119 |
|
| 120 |
# this is specific to GNU Fortran |
| 121 |
- if [[ ${FORTRANC} = gfortran ]] ; then |
| 122 |
- elog "updating for gfortran..." |
| 123 |
- sed -i -e "s/= -Df2cFortran/= -DgFortran/" Makefile.in \ |
| 124 |
+ if [[ $(tc-getFC) = *gfortran ]] ; then |
| 125 |
+ elog "updating for gfortran..." |
| 126 |
+ sed -i -e "s/= -Df2cFortran/= -DgFortran/" Makefile.in \ |
| 127 |
|| die "sed makefile.in failed" |
| 128 |
fi |
| 129 |
} |
| 130 |
@@ -80,7 +79,7 @@ |
| 131 |
src_compile() { |
| 132 |
local test_conf="${DAP_TEST_OPTS}" |
| 133 |
local myconf="--disable-dependency-tracking --enable-largefile \ |
| 134 |
- --enable-64bit" |
| 135 |
+ --enable-64bit" |
| 136 |
use fortran || myconf="${myconf} --disable-f77" |
| 137 |
# debug can be set to 2 for extra verbosity |
| 138 |
use debug && myconf="${myconf} --enable-debug=1" |
| 139 |
@@ -92,19 +91,19 @@ |
| 140 |
|
| 141 |
src_test() { |
| 142 |
if use full-test; then |
| 143 |
- cd "${S}"/nc_test |
| 144 |
- # These tests should all pass, but the non-local tests can take |
| 145 |
- # several hours to complete. |
| 146 |
- make check || die "Regression tests failed!" |
| 147 |
- cd "${S}" |
| 148 |
- # This test has unexpected failures |
| 149 |
- make check |
| 150 |
+ cd "${S}"/nc_test |
| 151 |
+ # These tests should all pass, but the non-local tests can take |
| 152 |
+ # several hours to complete. |
| 153 |
+ make check || die "Regression tests failed!" |
| 154 |
+ cd "${S}" |
| 155 |
+ # This test has unexpected failures |
| 156 |
+ make check |
| 157 |
else |
| 158 |
- # unit tests only |
| 159 |
- cd "${S}"/unit-tests |
| 160 |
- ln -sf ../ncdump/testsuite testsuite |
| 161 |
- # These tests should also pass |
| 162 |
- make check || die "Unit tests failed!" |
| 163 |
+ # unit tests only |
| 164 |
+ cd "${S}"/unit-tests |
| 165 |
+ ln -sf ../ncdump/testsuite testsuite |
| 166 |
+ # These tests should also pass |
| 167 |
+ make check || die "Unit tests failed!" |
| 168 |
fi |
| 169 |
} |
Archives