diff --git a/netcdf-err.patch b/netcdf-err.patch new file mode 100644 index 0000000..fc8a893 --- /dev/null +++ b/netcdf-err.patch @@ -0,0 +1,11 @@ +diff -up netcdf-c-4.4.1.1/h5_test/tst_h_par.c.err netcdf-c-4.4.1.1/h5_test/tst_h_par.c +--- netcdf-c-4.4.1.1/h5_test/tst_h_par.c.err 2016-11-21 11:27:08.000000000 -0700 ++++ netcdf-c-4.4.1.1/h5_test/tst_h_par.c 2016-11-29 11:34:59.433806850 -0700 +@@ -11,6 +11,7 @@ + $Id: tst_h_par.c,v 1.15 2010/05/25 13:53:04 ed Exp $ + */ + #include ++#include "err_macros.h" + #include + + /* Defining USE_MPE causes the MPE trace library to be used (and you diff --git a/netcdf.spec b/netcdf.spec index a7aaef5..192994e 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -7,6 +7,9 @@ Group: Applications/Engineering License: NetCDF URL: http://www.unidata.ucar.edu/software/netcdf/ Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Add missing #include "err_macros.h" +# https://github.com/Unidata/netcdf-c/pull/333 +Patch0: netcdf-err.patch BuildRequires: chrpath BuildRequires: doxygen @@ -175,6 +178,7 @@ NetCDF parallel openmpi static libraries %prep %setup -q -n %{name}-c-%{version} +%patch0 -p1 -b .err m4 libsrc/ncx.m4 > libsrc/ncx.c @@ -332,6 +336,7 @@ done %changelog * Tue Nov 29 2016 Orion Poplawski - 4.4.1.1-1 - Update to 4.4.1.1 +- Add patch to fix mpi tests compilation * Fri Oct 21 2016 Orion Poplawski - 4.4.1-4 - Rebuild for openmpi 2.0