Attachment 295741 Details for Bug 434078 – use cstring and disable parallel make

[patch] use cstring and disable parallel make

netcdf-headers.diff (text/plain), 1.56 KB, created by Patrice Dumas on 2008-02-24 16:26:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-02-24 16:26:20 UTC

Size: 1.56 KB

patch

obsolete

>? .build-3.6.2-6.fc9.log
>? i386
>? netcdf-3.6.2
>? netcdf-3.6.2-6.fc9.src.rpm
>Index: netcdf.spec
>===================================================================
>RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v
>retrieving revision 1.23
>diff -u -3 -p -r1.23 netcdf.spec
>--- netcdf.spec	21 Feb 2008 03:00:59 -0000	1.23
>+++ netcdf.spec	24 Feb 2008 16:25:00 -0000
>@@ -73,10 +73,12 @@ export FFLAGS="-fPIC ${RPM_OPT_FLAGS}"
> export F90FLAGS="$FFLAGS"
> export FCFLAGS="$FFLAGS"
> %configure --enable-shared
>-make %{?_smp_mflags}
>+# parallel build is broken, .mod file hasn't right deps %
>+#{?_smp_mflags}
>+make 
> 
> %install
>-%makeinstall
>+make install DESTDIR=${RPM_BUILD_ROOT}
> mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3
> /bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.* \
>   ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3
>Index: netcdf_gcc-3.3_needs_string-h.patch
>===================================================================
>RCS file: /cvs/extras/rpms/netcdf/devel/netcdf_gcc-3.3_needs_string-h.patch,v
>retrieving revision 1.1
>diff -u -3 -p -r1.1 netcdf_gcc-3.3_needs_string-h.patch
>--- netcdf_gcc-3.3_needs_string-h.patch	21 Feb 2008 03:00:59 -0000	1.1
>+++ netcdf_gcc-3.3_needs_string-h.patch	24 Feb 2008 16:25:00 -0000
>@@ -5,7 +5,7 @@ diff -urN netcdf-3.6.2/cxx/ncvalues.cpp 
>  #include <config.h>
>  #include <iostream>
>  #include <string>
>-+#include <string.h>
>++#include <cstring>
>  
>  #include "ncvalues.h"
>  
>@@ -16,7 +16,7 @@ diff -urN netcdf-3.6.2/examples/CXX/sfc_
>  
>  #include <iostream>
>  #include <netcdfcpp.h>
>-+#include <string.h>
>++#include <cstring>
>  
>  using namespace std;
>

Actions: View | Diff

Attachments on bug 434078: 295741