| 1 |
bicatali 07/12/06 17:20:10 |
| 2 |
|
| 3 |
Added: netcdf-3.6.2-as-needed.patch |
| 4 |
Log: |
| 5 |
Fixed for as-needed, cl closing bug #201493 |
| 6 |
(Portage version: 2.1.4_rc7) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: netcdf-3.6.2-as-needed.patch |
| 15 |
=================================================================== |
| 16 |
--- ./cxx/Makefile.am.orig 2007-12-06 17:12:03.352615935 +0000 |
| 17 |
+++ ./cxx/Makefile.am 2007-12-06 17:12:41.830808682 +0000 |
| 18 |
@@ -88,6 +88,7 @@ |
| 19 |
|
| 20 |
# Library source. |
| 21 |
libnetcdf_c___la_SOURCES = netcdf.cpp ncvalues.cpp |
| 22 |
+libnetcdf_c___la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la |
| 23 |
|
| 24 |
test: check |
| 25 |
|
| 26 |
--- ./fortran/Makefile.am.orig 2007-12-06 17:11:59.140375893 +0000 |
| 27 |
+++ ./fortran/Makefile.am 2007-12-06 17:13:18.480897252 +0000 |
| 28 |
@@ -35,6 +35,7 @@ |
| 29 |
# (it's generated by the configure script from nfconfig.in), or if |
| 30 |
# netcdf.inc has changed. |
| 31 |
libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc |
| 32 |
+libnetcdff_la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la |
| 33 |
|
| 34 |
# Is the user building netCDF-4? |
| 35 |
if USE_NETCDF4 |
| 36 |
@@ -71,7 +72,7 @@ |
| 37 |
|
| 38 |
# If F90 is built, include it's convenience library. |
| 39 |
if BUILD_F90 |
| 40 |
-libnetcdff_la_LIBADD = ../f90/libnetcdff90.la |
| 41 |
+libnetcdff_la_LIBADD += ../f90/libnetcdff90.la |
| 42 |
endif |
| 43 |
|
| 44 |
# If we are building the dll (under MinGW) then set the correct flags. |
| 45 |
--- ./Makefile.am.orig 2007-12-06 17:11:55.140147933 +0000 |
| 46 |
+++ ./Makefile.am 2007-12-06 17:12:41.830808682 +0000 |
| 47 |
@@ -57,7 +57,7 @@ |
| 48 |
# This is the list of subdirs for which Makefiles will be constructed |
| 49 |
# and run. ncgen must come before ncdump and cxx, because their tests |
| 50 |
# depend on it. nf_test depends upon ncgen as well. |
| 51 |
-SUBDIRS = $(F90_DIR) $(F77_DIR) libsrc $(V2_TEST) $(NCGEN) $(NCDUMP) \ |
| 52 |
+SUBDIRS = libsrc $(F90_DIR) $(F77_DIR) $(V2_TEST) $(NCGEN) $(NCDUMP) \ |
| 53 |
$(F77_TEST) ${CXX_DIR} nc_test $(MAN) $(EXAMPLES) |
| 54 |
|
| 55 |
# make test should do the same as make check. |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
-- |
| 60 |
gentoo-commits@g.o mailing list |
Archives