Hello community,
here is the log from the commit of package netcdf-fortran for openSUSE:Factory
checked in at 2020-09-15 16:25:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old)
and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf-fortran"
Tue Sep 15 16:25:48 2020 rev:17 rq:834367 version:4.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes
2020-07-21 15:51:12.404355783 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.4249/netcdf-fortran.changes
2020-09-15 16:26:22.914487171 +0200
@@ -1,0 +2,24 @@
+Mon Sep 14 14:01:08 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Make static build conditional.
+ The race due to libtool not allowing to handle f90 .mod files
+ when building static and dynamic versions of this library requires
+ to disable static builds by default.
+
+-------------------------------------------------------------------
+Thu Jul 23 16:39:20 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Add build support for gcc10 to HPC build (bsc#1174439).
+- Add build support for openmpi4.
+- Limit the numbers of parallel build to kludge around a race
+ condition due to libtool not being able to handle Fortran .mod
+ file creation and dependencies properly.
+- Make sure, optimization flags are also passed to the Fortran
+ compiler.
+- Remove not used options to configure.
+- Add -ffat-lto-objects for static build.
+- limit number of parallel jobs as libtool generated builds are
+ racy when .mod files have to be generated.
+- Increasing memory constrains to make sure tests don't fail.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf-fortran.spec ++++++
--- /var/tmp/diff_new_pack.SEvTnn/_old 2020-09-15 16:26:23.974488186 +0200
+++ /var/tmp/diff_new_pack.SEvTnn/_new 2020-09-15 16:26:23.974488186 +0200
@@ -39,10 +39,13 @@
%if "%flavor" == ""
ExclusiveArch: do_not_build
%define package_name %pname
+%define compiler_family gnu
%endif
ExcludeArch: s390 s390x
+%{bcond_with staticlibs}
+
%if "%flavor" == "gnu-hpc"
%global compiler_family gnu
%{bcond_with mpi}
@@ -92,6 +95,12 @@
%{bcond_without mpi}
%endif
+%if "%flavor" == "gnu7-hpc"
+%global compiler_family gnu
+%{bcond_with mpi}
+%global c_f_ver 7
+%endif
+
%if "%flavor" == "gnu7-openmpi-hpc"
%{?DisOMPI1}
%global compiler_family gnu
@@ -142,6 +151,12 @@
%{bcond_without mpi}
%endif
+%if "%flavor" == "gnu8-hpc"
+%global compiler_family gnu
+%{bcond_with mpi}
+%global c_f_ver 8
+%endif
+
%if "%flavor" == "gnu8-openmpi-hpc"
%{?DisOMPI1}
%global compiler_family gnu
@@ -192,6 +207,12 @@
%{bcond_without mpi}
%endif
+%if "%flavor" == "gnu9-hpc"
+%global compiler_family gnu
+%{bcond_with mpi}
+%global c_f_ver 9
+%endif
+
%if "%flavor" == "gnu9-openmpi-hpc"
%{?DisOMPI1}
%global compiler_family gnu
@@ -242,9 +263,71 @@
%{bcond_without mpi}
%endif
+%if "%flavor" == "gnu10-hpc"
+%global compiler_family gnu
+%{bcond_with mpi}
+%global c_f_ver 10
+%endif
+
+%if "%flavor" == "gnu10-openmpi-hpc"
+%{?DisOMPI1}
+%global compiler_family gnu
+%global mpi_flavor openmpi
+%global mpi_ver 1
+%global c_f_ver 10
+%{bcond_without mpi}
+%endif
+
+%if "%flavor" == "gnu10-openmpi2-hpc"
+%{?DisOMPI2}
+%global compiler_family gnu
+%global mpi_flavor openmpi
+%global mpi_ver 2
+%global c_f_ver 10
+%{bcond_without mpi}
+%endif
+
+%if "%flavor" == "gnu10-openmpi3-hpc"
+%{?DisOMPI3}
+%global compiler_family gnu
+%global mpi_flavor openmpi
+%global mpi_ver 3
+%global c_f_ver 10
+%{bcond_without mpi}
+%endif
+
+%if "%flavor" == "gnu10-openmpi4-hpc"
+%{?DisOMPI4}
+%global compiler_family gnu
+%global mpi_flavor openmpi
+%global mpi_ver 4
+%global c_f_ver 10
+%{bcond_without mpi}
+%endif
+
+%if "%flavor" == "gnu10-mvapich2-hpc"
+%global compiler_family gnu
+%global mpi_flavor mvapich2
+%global c_f_ver 10
+%{bcond_without mpi}
+%endif
+
+%if "%flavor" == "gnu10-mpich-hpc"
+%global compiler_family gnu
+%global mpi_flavor mpich
+%global c_f_ver 10
+%{bcond_without mpi}
+%endif
+
+%define limit_cores(c:) %{?_smp_mflags: %(a=1;
+ b=$(sed -se "s/.*-j[[:space:]]*\\([[:digit:]]\\+\\).*/\\1/" <<<
%_smp_mflags);
+ [ $b -le $a ] || b=$a ;
+ sed -se "s/\\(.*-j[[:space:]]*\\)[[:digit:]]\\+\\(.*\\)/\\1$b/"
<<< %_smp_mflags )}
+
%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_')
%{?hpc_init:%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}}
%{?with_mpi:-m %mpi_flavor %{?mpi_ver:-V %mpi_ver}}}}
+%{!?hpc_package_name_tail:%define hpc_package_name_tail %{nil}}
%if 0%{!?package_name:1}
%define package_name %{hpc_package_name %_ver}
@@ -293,7 +376,7 @@
%package -n %{libname}%{hpc_package_name_tail %_ver}
Summary: Shared libraries for the NetCDF scientific data format
Group: System/Libraries
-%hpc_requires
+%{?hpc_requires}
Requires:
libnetcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc
%description -n %{libname}%{hpc_package_name_tail %_ver}
@@ -337,7 +420,7 @@
Requires: libcurl-devel >= 7.18.0
Requires: pkgconfig
Requires: zlib-devel >= 1.2.5
-%hpc_requires_devel
+%{?hpc_requires_devel}
Requires:
netcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel
%description devel
@@ -374,10 +457,12 @@
chmod a-x RELEASE_NOTES.md
%build
+%{?_lto_cflags: %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects}
+%{?with_staticlibs:%{?_smp_mflags:%global _smp_mflags %{limit_cores -c 8}}}
%{hpc_setup}
module load netcdf
-export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5"
-export FCFLAGS="-std=legacy"
+export CFLAGS="%{optflags} -I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB
-lhdf5"
+export FCFLAGS="%{optflags} -std=legacy"
export FFLAGS=$FCFLAGS
export CPPFLAGS=$CFLAGS
export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5"
@@ -389,19 +474,21 @@
%endif
%hpc_configure \
--enable-shared \
- --enable-netcdf-4 \
- --enable-dap \
- --enable-ncgen4 \
--with-pic \
--disable-doxygen \
+%if %{with staticlibs}
--enable-static
+%else
+ --disable-static
+%endif
make %{?_smp_mflags}
%install
%{hpc_setup}
module load netcdf
-export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5"
+export CFLAGS="%{optflags} -I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB
-lhdf5"
+export FCFLAGS="%{optflags}"
export CPPFLAGS=$CFLAGS
export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5"
%if %{with mpi}
@@ -511,7 +598,9 @@
%dir %{hpc_mandir}
%{hpc_mandir}/man3/
+%if %{with staticlibs}
%files devel-static
%{hpc_libdir}/libnetcdff.a
+%endif
%changelog
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.SEvTnn/_old 2020-09-15 16:26:24.002488212 +0200
+++ /var/tmp/diff_new_pack.SEvTnn/_new 2020-09-15 16:26:24.002488212 +0200
@@ -1,13 +1,13 @@
<constraints>
<hardware>
<disk>
- <size unit="G">2</size>
+ <size unit="G">5</size>
</disk>
<memory>
- <size unit="G">2</size>
+ <size unit="G">5</size>
</memory>
<physicalmemory>
- <size unit="G">1</size>
+ <size unit="G">2</size>
</physicalmemory>
</hardware>
</constraints>
