| 1 |
bicatali 09/01/15 15:04:19 |
| 2 |
|
| 3 |
Added: netcdf-3.6.3-as-needed.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
(Portage version: 2.2_rc22/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/netcdf/files/netcdf-3.6.3-as-needed.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/netcdf/files/netcdf-3.6.3-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.3-as-needed.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: netcdf-3.6.3-as-needed.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nur netcdf-3.6.3.orig/cxx/Makefile.am netcdf-3.6.3/cxx/Makefile.am |
| 17 |
--- netcdf-3.6.3.orig/cxx/Makefile.am 2008-04-04 18:05:25.000000000 +0100 |
| 18 |
+++ netcdf-3.6.3/cxx/Makefile.am 2009-01-15 14:46:15.895277408 +0000 |
| 19 |
@@ -105,6 +105,6 @@ |
| 20 |
|
| 21 |
# Library source. |
| 22 |
libnetcdf_c___la_SOURCES = netcdf.cpp ncvalues.cpp |
| 23 |
- |
| 24 |
+libnetcdf_c___la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la |
| 25 |
test: check |
| 26 |
|
| 27 |
diff -Nur netcdf-3.6.3.orig/fortran/Makefile.am netcdf-3.6.3/fortran/Makefile.am |
| 28 |
--- netcdf-3.6.3.orig/fortran/Makefile.am 2008-04-22 22:52:04.000000000 +0100 |
| 29 |
+++ netcdf-3.6.3/fortran/Makefile.am 2009-01-15 14:47:03.426443772 +0000 |
| 30 |
@@ -60,6 +60,7 @@ |
| 31 |
# (it's generated by the configure script from nfconfig.in), or if |
| 32 |
# netcdf.inc has changed. |
| 33 |
libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc |
| 34 |
+libnetcdff_la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la |
| 35 |
|
| 36 |
# Is the user building netCDF-4? |
| 37 |
if USE_NETCDF4 |
| 38 |
@@ -92,7 +93,7 @@ |
| 39 |
|
| 40 |
# If F90 is built, include it's convenience library. |
| 41 |
if BUILD_F90 |
| 42 |
-libnetcdff_la_LIBADD = ../f90/libnetcdff90.la |
| 43 |
+libnetcdff_la_LIBADD += ../f90/libnetcdff90.la |
| 44 |
endif |
| 45 |
|
| 46 |
# If we are building the dll (under MinGW) then set the correct flags. |
| 47 |
diff -Nur netcdf-3.6.3.orig/Makefile.am netcdf-3.6.3/Makefile.am |
| 48 |
--- netcdf-3.6.3.orig/Makefile.am 2008-06-27 14:15:13.000000000 +0100 |
| 49 |
+++ netcdf-3.6.3/Makefile.am 2009-01-15 14:48:04.594871206 +0000 |
| 50 |
@@ -88,7 +88,7 @@ |
| 51 |
# $(DAPDIR) $(NCDAPDIR) $(LIBSRC4_DIR) \ |
| 52 |
# $(V2_TEST) $(NCGEN) $(NCDUMP) $(F77_TEST) ${CXX_DIR} $(CXX4) \ |
| 53 |
# $(NC_TEST_DIR) $(NC_TEST4) $(MAN) $(EXAMPLES) win32 |
| 54 |
-SUBDIRS = $(F90_DIR) $(F77_DIR) $(LIBSRC_DIR) $(LIBSRC4_DIR) \ |
| 55 |
+SUBDIRS = $(LIBSRC_DIR) $(F90_DIR) $(F77_DIR) $(LIBSRC4_DIR) \ |
| 56 |
$(V2_TEST) $(NCGEN) $(NCDUMP) $(F77_TEST) ${CXX_DIR} $(CXX4) \ |
| 57 |
$(NC_TEST_DIR) $(NC_TEST4) $(MAN) $(EXAMPLES) win32 |
Archives