try to fix GCC 4.3 build

This commit is contained in:
Ed Hill 2008-02-21 03:00:59 +00:00
parent 2aa714daef
commit 67e50c7b33
2 changed files with 28 additions and 1 deletions

View File

@ -1,12 +1,13 @@
Name: netcdf
Version: 3.6.2
Release: 5%{?dist}
Release: 6%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, gawk
@ -62,6 +63,7 @@ This package contains the netCDF-3 static libs.
%prep
%setup -q
%patch0 -p1
%build
export FC="gfortran"
@ -120,6 +122,9 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* 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
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.6.2-5
- Autorebuild for GCC 4.3

View File

@ -0,0 +1,22 @@
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;