- Change patch to include <cstring>
This commit is contained in:
parent
67e50c7b33
commit
72fa52a8ee
21
netcdf-3.6.2-gcc43.patch
Normal file
21
netcdf-3.6.2-gcc43.patch
Normal file
@ -0,0 +1,21 @@
|
||||
--- netcdf-3.6.2/cxx/ncvalues.cpp.gcc43 2006-12-29 09:38:56.000000000 -0700
|
||||
+++ netcdf-3.6.2/cxx/ncvalues.cpp 2008-04-02 13:45:39.000000000 -0600
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <config.h>
|
||||
#include <iostream>
|
||||
-#include <string>
|
||||
+#include <cstring>
|
||||
|
||||
#include "ncvalues.h"
|
||||
|
||||
--- netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp.gcc43 2007-01-19 05:52:13.000000000 -0700
|
||||
+++ netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp 2008-04-02 13:46:08.000000000 -0600
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <netcdfcpp.h>
|
||||
+#include <cstring>
|
||||
|
||||
using namespace std;
|
||||
|
@ -1,13 +1,13 @@
|
||||
Name: netcdf
|
||||
Version: 3.6.2
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
Summary: Libraries for the Unidata network Common Data Form (NetCDF v3)
|
||||
|
||||
Group: Applications/Engineering
|
||||
License: NetCDF
|
||||
URL: http://my.unidata.ucar.edu/content/software/netcdf/index.html
|
||||
Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.2.tar.bz2
|
||||
Patch0: netcdf_gcc-3.3_needs_string-h.patch
|
||||
Patch0: netcdf-3.6.2-gcc43.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: gcc-gfortran, gawk
|
||||
@ -63,7 +63,7 @@ This package contains the netCDF-3 static libs.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch0 -p1 -b .gcc43
|
||||
|
||||
%build
|
||||
export FC="gfortran"
|
||||
@ -122,6 +122,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 2 2008 Orion Poplawski <orion@cora.nwra.com> - 3.6.2-7
|
||||
- Change patch to include <cstring>
|
||||
|
||||
* Wed Feb 20 2008 Ed Hill <ed@eh3.com> - 3.6.2-6
|
||||
- add patch that (hopefully?) allows the GCC 4.3 build to proceed
|
||||
|
||||
|
@ -1,22 +0,0 @@
|
||||
diff -urN netcdf-3.6.2/cxx/ncvalues.cpp netcdf-3.6.2-NEW/cxx/ncvalues.cpp
|
||||
--- netcdf-3.6.2/cxx/ncvalues.cpp 2006-12-29 11:38:56.000000000 -0500
|
||||
+++ netcdf-3.6.2-NEW/cxx/ncvalues.cpp 2008-02-20 21:28:28.000000000 -0500
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <config.h>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
+#include <string.h>
|
||||
|
||||
#include "ncvalues.h"
|
||||
|
||||
diff -urN netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp netcdf-3.6.2-NEW/examples/CXX/sfc_pres_temp_rd.cpp
|
||||
--- netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp 2007-01-19 07:52:13.000000000 -0500
|
||||
+++ netcdf-3.6.2-NEW/examples/CXX/sfc_pres_temp_rd.cpp 2008-02-20 21:48:24.000000000 -0500
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <netcdfcpp.h>
|
||||
+#include <string.h>
|
||||
|
||||
using namespace std;
|
||||
|
Loading…
Reference in New Issue
Block a user