summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-07-05 16:37:57 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-07-05 16:37:57 +0000
commit7aacfe71b26aaa0acc2f0f5651b02ef398a2795e (patch)
treede82459179811f3d8950a13e36423b216fe1170c /sci-libs/netcdf/files
parentObjectiveC2/runtime.h is still needed in some cases (diff)
downloadhistorical-7aacfe71b26aaa0acc2f0f5651b02ef398a2795e.tar.gz
historical-7aacfe71b26aaa0acc2f0f5651b02ef398a2795e.tar.bz2
historical-7aacfe71b26aaa0acc2f0f5651b02ef398a2795e.zip
Version bump
Package-Manager: portage-2.2.01.22097-prefix/cvs/Linux x86_64 Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-libs/netcdf/files')
-rw-r--r--sci-libs/netcdf/files/netcdf-3.6.3-as-needed.patch43
-rw-r--r--sci-libs/netcdf/files/netcdf-3.6.3-parallel.patch17
2 files changed, 0 insertions, 60 deletions
diff --git a/sci-libs/netcdf/files/netcdf-3.6.3-as-needed.patch b/sci-libs/netcdf/files/netcdf-3.6.3-as-needed.patch
deleted file mode 100644
index 944600824706..000000000000
--- a/sci-libs/netcdf/files/netcdf-3.6.3-as-needed.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Nur netcdf-3.6.3.orig/cxx/Makefile.am netcdf-3.6.3/cxx/Makefile.am
---- netcdf-3.6.3.orig/cxx/Makefile.am 2008-04-04 18:05:25.000000000 +0100
-+++ netcdf-3.6.3/cxx/Makefile.am 2009-01-15 14:46:15.895277408 +0000
-@@ -105,6 +105,6 @@
-
- # Library source.
- libnetcdf_c___la_SOURCES = netcdf.cpp ncvalues.cpp
--
-+libnetcdf_c___la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la
- test: check
-
-diff -Nur netcdf-3.6.3.orig/fortran/Makefile.am netcdf-3.6.3/fortran/Makefile.am
---- netcdf-3.6.3.orig/fortran/Makefile.am 2008-04-22 22:52:04.000000000 +0100
-+++ netcdf-3.6.3/fortran/Makefile.am 2009-01-15 14:47:03.426443772 +0000
-@@ -60,6 +60,7 @@
- # (it's generated by the configure script from nfconfig.in), or if
- # netcdf.inc has changed.
- libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc
-+libnetcdff_la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la
-
- # Is the user building netCDF-4?
- if USE_NETCDF4
-@@ -92,7 +93,7 @@
-
- # If F90 is built, include it's convenience library.
- if BUILD_F90
--libnetcdff_la_LIBADD = ../f90/libnetcdff90.la
-+libnetcdff_la_LIBADD += ../f90/libnetcdff90.la
- endif
-
- # If we are building the dll (under MinGW) then set the correct flags.
-diff -Nur netcdf-3.6.3.orig/Makefile.am netcdf-3.6.3/Makefile.am
---- netcdf-3.6.3.orig/Makefile.am 2008-06-27 14:15:13.000000000 +0100
-+++ netcdf-3.6.3/Makefile.am 2009-01-15 14:48:04.594871206 +0000
-@@ -88,7 +88,7 @@
- # $(DAPDIR) $(NCDAPDIR) $(LIBSRC4_DIR) \
- # $(V2_TEST) $(NCGEN) $(NCDUMP) $(F77_TEST) ${CXX_DIR} $(CXX4) \
- # $(NC_TEST_DIR) $(NC_TEST4) $(MAN) $(EXAMPLES) win32
--SUBDIRS = $(F90_DIR) $(F77_DIR) $(LIBSRC_DIR) $(LIBSRC4_DIR) \
-+SUBDIRS = $(LIBSRC_DIR) $(F90_DIR) $(F77_DIR) $(LIBSRC4_DIR) \
- $(V2_TEST) $(NCGEN) $(NCDUMP) $(F77_TEST) ${CXX_DIR} $(CXX4) \
- $(NC_TEST_DIR) $(NC_TEST4) $(MAN) $(EXAMPLES) win32
-
diff --git a/sci-libs/netcdf/files/netcdf-3.6.3-parallel.patch b/sci-libs/netcdf/files/netcdf-3.6.3-parallel.patch
deleted file mode 100644
index 14364b831ccf..000000000000
--- a/sci-libs/netcdf/files/netcdf-3.6.3-parallel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/f90/Makefile.am b/f90/Makefile.am
-index ee56177..e9828eb 100644
---- a/f90/Makefile.am
-+++ b/f90/Makefile.am
-@@ -64,10 +64,12 @@ if UPPER_CASE_MOD
- nodist_include_HEADERS = TYPESIZES.mod NETCDF.mod
- TYPESIZES.mod: typeSizes.o
- NETCDF.mod: $(NETCDF_O)
-+BUILT_SOURCES = TYPESIZES.mod
- else
- nodist_include_HEADERS = typesizes.mod netcdf.mod
- typesizes.mod: typeSizes.o
- netcdf.mod: $(NETCDF_O)
-+BUILT_SOURCES = typesizes.mod
- endif
-
- # This is what we are building: a convenience library of F90 functions.