Compare commits
18 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
68fe77b12e | ||
|
d504bdb448 | ||
|
1277d0f9ec | ||
|
aaefcf4cbe | ||
|
3a258961b8 | ||
|
ae534097dd | ||
|
b666cb3475 | ||
|
d186805f7c | ||
|
8d64c4db7a | ||
|
31c4b7cc39 | ||
|
7f44b30141 | ||
|
be72d79ead | ||
|
e317286170 | ||
|
9c64e92ba0 | ||
|
3b694e267f | ||
|
13220cd74d | ||
|
87ff6a3415 | ||
|
a8caef4f46 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -15,3 +15,6 @@ netcdf-4.1.1.tar.gz
|
|||||||
/netcdf-4.4.0.tar.gz
|
/netcdf-4.4.0.tar.gz
|
||||||
/netcdf-4.4.1.tar.gz
|
/netcdf-4.4.1.tar.gz
|
||||||
/netcdf-4.4.1.1.tar.gz
|
/netcdf-4.4.1.1.tar.gz
|
||||||
|
/netcdf-4.6.2.1.tar.gz
|
||||||
|
/netcdf-4.6.3.tar.gz
|
||||||
|
/netcdf-4.7.0.tar.gz
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
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 <nc_tests.h>
|
|
||||||
+#include "err_macros.h"
|
|
||||||
#include <hdf5.h>
|
|
||||||
|
|
||||||
/* Defining USE_MPE causes the MPE trace library to be used (and you
|
|
118
netcdf.spec
118
netcdf.spec
@ -1,16 +1,13 @@
|
|||||||
Name: netcdf
|
Name: netcdf
|
||||||
Version: 4.4.1.1
|
Version: 4.7.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Libraries for the Unidata network Common Data Form
|
Summary: Libraries for the Unidata network Common Data Form
|
||||||
|
|
||||||
Group: Applications/Engineering
|
|
||||||
License: NetCDF
|
License: NetCDF
|
||||||
URL: http://www.unidata.ucar.edu/software/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
|
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: libtool
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: hdf-static
|
BuildRequires: hdf-static
|
||||||
@ -19,7 +16,7 @@ BuildRequires: gawk
|
|||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: m4
|
BuildRequires: m4
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
%ifnarch s390 s390x %{mips}
|
%ifarch %{valgrind_arches}
|
||||||
BuildRequires: valgrind
|
BuildRequires: valgrind
|
||||||
%endif
|
%endif
|
||||||
#mpiexec segfaults if ssh is not present
|
#mpiexec segfaults if ssh is not present
|
||||||
@ -35,10 +32,6 @@ Requires: hdf5%{?_isa} = %{_hdf5_version}
|
|||||||
%global with_mpich 0
|
%global with_mpich 0
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%ifarch s390 s390x
|
|
||||||
# No openmpi on s390(x)
|
|
||||||
%global with_openmpi 0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with_mpich}
|
%if %{with_mpich}
|
||||||
%global mpi_list mpich
|
%global mpi_list mpich
|
||||||
@ -81,7 +74,6 @@ NetCDF data is:
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for netcdf
|
Summary: Development files for netcdf
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: pkgconfig%{?_isa}
|
Requires: pkgconfig%{?_isa}
|
||||||
Requires: hdf5-devel%{?_isa}
|
Requires: hdf5-devel%{?_isa}
|
||||||
@ -94,7 +86,6 @@ man pages.
|
|||||||
|
|
||||||
%package static
|
%package static
|
||||||
Summary: Static libs for netcdf
|
Summary: Static libs for netcdf
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description static
|
%description static
|
||||||
@ -104,7 +95,6 @@ This package contains the netCDF C static libs.
|
|||||||
%if %{with_mpich}
|
%if %{with_mpich}
|
||||||
%package mpich
|
%package mpich
|
||||||
Summary: NetCDF mpich libraries
|
Summary: NetCDF mpich libraries
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: hdf5-mpich%{?_isa} = %{_hdf5_version}
|
Requires: hdf5-mpich%{?_isa} = %{_hdf5_version}
|
||||||
BuildRequires: mpich-devel
|
BuildRequires: mpich-devel
|
||||||
BuildRequires: hdf5-mpich-devel >= 1.8.4
|
BuildRequires: hdf5-mpich-devel >= 1.8.4
|
||||||
@ -117,7 +107,6 @@ NetCDF parallel mpich libraries
|
|||||||
|
|
||||||
%package mpich-devel
|
%package mpich-devel
|
||||||
Summary: NetCDF mpich development files
|
Summary: NetCDF mpich development files
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
|
Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
|
||||||
Requires: pkgconfig%{?_isa}
|
Requires: pkgconfig%{?_isa}
|
||||||
Requires: hdf5-mpich-devel%{?_isa}
|
Requires: hdf5-mpich-devel%{?_isa}
|
||||||
@ -131,7 +120,6 @@ NetCDF parallel mpich development files
|
|||||||
|
|
||||||
%package mpich-static
|
%package mpich-static
|
||||||
Summary: NetCDF mpich static libraries
|
Summary: NetCDF mpich static libraries
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release}
|
Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release}
|
||||||
Provides: %{name}-mpich2-static = %{version}-%{release}
|
Provides: %{name}-mpich2-static = %{version}-%{release}
|
||||||
Obsoletes: %{name}-mpich2-static < 4.3.0-4
|
Obsoletes: %{name}-mpich2-static < 4.3.0-4
|
||||||
@ -144,7 +132,6 @@ NetCDF parallel mpich static libraries
|
|||||||
%if %{with_openmpi}
|
%if %{with_openmpi}
|
||||||
%package openmpi
|
%package openmpi
|
||||||
Summary: NetCDF openmpi libraries
|
Summary: NetCDF openmpi libraries
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: hdf5-openmpi%{?_isa} = %{_hdf5_version}
|
Requires: hdf5-openmpi%{?_isa} = %{_hdf5_version}
|
||||||
BuildRequires: openmpi-devel
|
BuildRequires: openmpi-devel
|
||||||
BuildRequires: hdf5-openmpi-devel >= 1.8.4
|
BuildRequires: hdf5-openmpi-devel >= 1.8.4
|
||||||
@ -155,7 +142,6 @@ NetCDF parallel openmpi libraries
|
|||||||
|
|
||||||
%package openmpi-devel
|
%package openmpi-devel
|
||||||
Summary: NetCDF openmpi development files
|
Summary: NetCDF openmpi development files
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}-openmpi%{_isa} = %{version}-%{release}
|
Requires: %{name}-openmpi%{_isa} = %{version}-%{release}
|
||||||
Requires: openmpi-devel%{?_isa}
|
Requires: openmpi-devel%{?_isa}
|
||||||
Requires: pkgconfig%{?_isa}
|
Requires: pkgconfig%{?_isa}
|
||||||
@ -168,7 +154,6 @@ NetCDF parallel openmpi development files
|
|||||||
|
|
||||||
%package openmpi-static
|
%package openmpi-static
|
||||||
Summary: NetCDF openmpi static libraries
|
Summary: NetCDF openmpi static libraries
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}-openmpi-devel%{?_isa} = %{version}-%{release}
|
Requires: %{name}-openmpi-devel%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description openmpi-static
|
%description openmpi-static
|
||||||
@ -177,33 +162,31 @@ NetCDF parallel openmpi static libraries
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-c-%{version}
|
%autosetup -p1 -n %{name}-c-%{version}
|
||||||
%patch0 -p1 -b .err
|
|
||||||
m4 libsrc/ncx.m4 > libsrc/ncx.c
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#Do out of tree builds
|
#Do out of tree builds
|
||||||
%global _configure ../configure
|
%global _configure ../configure
|
||||||
#Common configure options
|
#Common configure options
|
||||||
|
export LDFLAGS="%{__global_ldflags} -L%{_libdir}/hdf"
|
||||||
%global configure_opts \\\
|
%global configure_opts \\\
|
||||||
--enable-shared \\\
|
--enable-shared \\\
|
||||||
--enable-netcdf-4 \\\
|
--enable-netcdf-4 \\\
|
||||||
--enable-dap \\\
|
--enable-dap \\\
|
||||||
--enable-extra-example-tests \\\
|
--enable-extra-example-tests \\\
|
||||||
CPPFLAGS=-I%{_includedir}/hdf \\\
|
CPPFLAGS=-I%{_includedir}/hdf \\\
|
||||||
LIBS="-ldf -ljpeg" \\\
|
LIBS="-ltirpc" \\\
|
||||||
--enable-hdf4 \\\
|
--enable-hdf4 \\\
|
||||||
--disable-dap-remote-tests \\\
|
--disable-dap-remote-tests \\\
|
||||||
%{nil}
|
%{nil}
|
||||||
export LDFLAGS="%{__global_ldflags} -L%{_libdir}/hdf"
|
|
||||||
|
|
||||||
# Serial build
|
# Serial build
|
||||||
mkdir build
|
mkdir build
|
||||||
pushd build
|
pushd build
|
||||||
ln -s ../configure .
|
ln -s ../configure .
|
||||||
%configure %{configure_opts}
|
%configure %{configure_opts}
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# MPI builds
|
# MPI builds
|
||||||
@ -222,12 +205,8 @@ do
|
|||||||
--includedir=%{_includedir}/$mpi-%{_arch} \
|
--includedir=%{_includedir}/$mpi-%{_arch} \
|
||||||
--datarootdir=%{_libdir}/$mpi/share \
|
--datarootdir=%{_libdir}/$mpi/share \
|
||||||
--mandir=%{_libdir}/$mpi/share/man \
|
--mandir=%{_libdir}/$mpi/share/man \
|
||||||
%ifnarch s390 s390x
|
|
||||||
--enable-parallel-tests
|
--enable-parallel-tests
|
||||||
%else
|
%make_build
|
||||||
%{nil}
|
|
||||||
%endif
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
module purge
|
module purge
|
||||||
popd
|
popd
|
||||||
done
|
done
|
||||||
@ -252,6 +231,8 @@ done
|
|||||||
# Set to 1 to fail if tests fail
|
# Set to 1 to fail if tests fail
|
||||||
fail=1
|
fail=1
|
||||||
make -C build check || ( cat build/*/test-suite.log && exit $fail )
|
make -C build check || ( cat build/*/test-suite.log && exit $fail )
|
||||||
|
# Allow openmpi to run with more processes than cores
|
||||||
|
export OMPI_MCA_rmaps_base_oversubscribe=1
|
||||||
for mpi in %{mpi_list}
|
for mpi in %{mpi_list}
|
||||||
do
|
do
|
||||||
module load mpi/$mpi-%{_arch}
|
module load mpi/$mpi-%{_arch}
|
||||||
@ -260,24 +241,25 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYRIGHT README.md RELEASE_NOTES.md
|
%license COPYRIGHT
|
||||||
|
%doc README.md RELEASE_NOTES.md
|
||||||
%{_bindir}/nccopy
|
%{_bindir}/nccopy
|
||||||
%{_bindir}/ncdump
|
%{_bindir}/ncdump
|
||||||
%{_bindir}/ncgen
|
%{_bindir}/ncgen
|
||||||
%{_bindir}/ncgen3
|
%{_bindir}/ncgen3
|
||||||
%{_libdir}/*.so.11*
|
%{_libdir}/*.so.15*
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc examples
|
%doc examples
|
||||||
%{_bindir}/nc-config
|
%{_bindir}/nc-config
|
||||||
%{_includedir}/netcdf.h
|
%{_includedir}/netcdf.h
|
||||||
|
%{_includedir}/netcdf_aux.h
|
||||||
|
%{_includedir}/netcdf_filter.h
|
||||||
%{_includedir}/netcdf_meta.h
|
%{_includedir}/netcdf_meta.h
|
||||||
%{_includedir}/netcdf_mem.h
|
%{_includedir}/netcdf_mem.h
|
||||||
%{_libdir}/libnetcdf.settings
|
%{_libdir}/libnetcdf.settings
|
||||||
@ -290,17 +272,23 @@ done
|
|||||||
|
|
||||||
%if %{with_mpich}
|
%if %{with_mpich}
|
||||||
%files mpich
|
%files mpich
|
||||||
%doc COPYRIGHT README.md RELEASE_NOTES.md
|
%license COPYRIGHT
|
||||||
|
%doc README.md RELEASE_NOTES.md
|
||||||
%{_libdir}/mpich/bin/nccopy
|
%{_libdir}/mpich/bin/nccopy
|
||||||
%{_libdir}/mpich/bin/ncdump
|
%{_libdir}/mpich/bin/ncdump
|
||||||
%{_libdir}/mpich/bin/ncgen
|
%{_libdir}/mpich/bin/ncgen
|
||||||
%{_libdir}/mpich/bin/ncgen3
|
%{_libdir}/mpich/bin/ncgen3
|
||||||
%{_libdir}/mpich/lib/*.so.11*
|
%{_libdir}/mpich/lib/*.so.15*
|
||||||
%doc %{_libdir}/mpich/share/man/man1/*.1*
|
%doc %{_libdir}/mpich/share/man/man1/*.1*
|
||||||
|
|
||||||
%files mpich-devel
|
%files mpich-devel
|
||||||
%{_libdir}/mpich/bin/nc-config
|
%{_libdir}/mpich/bin/nc-config
|
||||||
%{_includedir}/mpich-%{_arch}
|
%{_includedir}/mpich-%{_arch}/netcdf.h
|
||||||
|
%{_includedir}/mpich-%{_arch}/netcdf_aux.h
|
||||||
|
%{_includedir}/mpich-%{_arch}/netcdf_filter.h
|
||||||
|
%{_includedir}/mpich-%{_arch}/netcdf_meta.h
|
||||||
|
%{_includedir}/mpich-%{_arch}/netcdf_mem.h
|
||||||
|
%{_includedir}/mpich-%{_arch}/netcdf_par.h
|
||||||
%{_libdir}/mpich/lib/libnetcdf.settings
|
%{_libdir}/mpich/lib/libnetcdf.settings
|
||||||
%{_libdir}/mpich/lib/*.so
|
%{_libdir}/mpich/lib/*.so
|
||||||
%{_libdir}/mpich/lib/pkgconfig/%{name}.pc
|
%{_libdir}/mpich/lib/pkgconfig/%{name}.pc
|
||||||
@ -312,17 +300,23 @@ done
|
|||||||
|
|
||||||
%if %{with_openmpi}
|
%if %{with_openmpi}
|
||||||
%files openmpi
|
%files openmpi
|
||||||
%doc COPYRIGHT README.md RELEASE_NOTES.md
|
%license COPYRIGHT
|
||||||
|
%doc README.md RELEASE_NOTES.md
|
||||||
%{_libdir}/openmpi/bin/nccopy
|
%{_libdir}/openmpi/bin/nccopy
|
||||||
%{_libdir}/openmpi/bin/ncdump
|
%{_libdir}/openmpi/bin/ncdump
|
||||||
%{_libdir}/openmpi/bin/ncgen
|
%{_libdir}/openmpi/bin/ncgen
|
||||||
%{_libdir}/openmpi/bin/ncgen3
|
%{_libdir}/openmpi/bin/ncgen3
|
||||||
%{_libdir}/openmpi/lib/*.so.11*
|
%{_libdir}/openmpi/lib/*.so.15*
|
||||||
%doc %{_libdir}/openmpi/share/man/man1/*.1*
|
%doc %{_libdir}/openmpi/share/man/man1/*.1*
|
||||||
|
|
||||||
%files openmpi-devel
|
%files openmpi-devel
|
||||||
%{_libdir}/openmpi/bin/nc-config
|
%{_libdir}/openmpi/bin/nc-config
|
||||||
%{_includedir}/openmpi-%{_arch}
|
%{_includedir}/openmpi-%{_arch}/netcdf.h
|
||||||
|
%{_includedir}/openmpi-%{_arch}/netcdf_aux.h
|
||||||
|
%{_includedir}/openmpi-%{_arch}/netcdf_filter.h
|
||||||
|
%{_includedir}/openmpi-%{_arch}/netcdf_meta.h
|
||||||
|
%{_includedir}/openmpi-%{_arch}/netcdf_mem.h
|
||||||
|
%{_includedir}/openmpi-%{_arch}/netcdf_par.h
|
||||||
%{_libdir}/openmpi/lib/libnetcdf.settings
|
%{_libdir}/openmpi/lib/libnetcdf.settings
|
||||||
%{_libdir}/openmpi/lib/*.so
|
%{_libdir}/openmpi/lib/*.so
|
||||||
%{_libdir}/openmpi/lib/pkgconfig/%{name}.pc
|
%{_libdir}/openmpi/lib/pkgconfig/%{name}.pc
|
||||||
@ -334,6 +328,48 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 17 2019 Orion Poplawski <orion@nwra.com> - 4.7.0-1
|
||||||
|
- Update to 4.7.0
|
||||||
|
|
||||||
|
* Sat Mar 16 2019 Orion Poplawski <orion@nwra.com> - 4.6.3-1
|
||||||
|
- Update to 4.6.3
|
||||||
|
|
||||||
|
* Thu Feb 14 2019 Orion Poplawski <orion@nwra.com> - 4.4.1.1-12
|
||||||
|
- Rebuild for openmpi 3.1.3
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Apr 09 2018 Orion Poplawski <orion@nwra.com> - 4.4.1.1-9
|
||||||
|
- Run libtoolize to not strip link flags (bug #1548732)
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 02 2018 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-7
|
||||||
|
- Rebuild for gcc 8.0
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Dec 08 2016 Dan Horák <dan[at]danny.cz> - 4.4.1.1-3
|
||||||
|
- Enable openmpi for s390(x) on F>=26
|
||||||
|
|
||||||
|
* Tue Dec 06 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-2
|
||||||
|
- Rebuild for hdf5 1.8.18
|
||||||
|
|
||||||
* Tue Nov 29 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-1
|
* Tue Nov 29 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-1
|
||||||
- Update to 4.4.1.1
|
- Update to 4.4.1.1
|
||||||
- Add patch to fix mpi tests compilation
|
- Add patch to fix mpi tests compilation
|
||||||
|
Loading…
Reference in New Issue
Block a user