Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2020-07-17 20:49:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf-fortran" Fri Jul 17 20:49:36 2020 rev:15 rq:821326 version:4.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2020-07-01 20:44:07.618376362 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3592/netcdf-fortran.changes 2020-07-17 20:50:21.700889720 +0200 @@ -1,0 +2,8 @@ +Wed Jul 15 16:55:04 UTC 2020 - Egbert Eich <[email protected]> + +- Add serial HPC build flavor (boo#1174177). + For loading serial module, run 'module load netcdf-fortran' + for an MPI variant use 'module load pnetcdf-fortran'. +- Fixed bug in module file. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf-fortran.spec ++++++ --- /var/tmp/diff_new_pack.AWjhhG/_old 2020-07-17 20:50:22.756890821 +0200 +++ /var/tmp/diff_new_pack.AWjhhG/_new 2020-07-17 20:50:22.760890826 +0200 @@ -38,6 +38,11 @@ ExcludeArch: s390 s390x +%if "%flavor" == "gnu-hpc" +%global compiler_family gnu +%{bcond_with mpi} +%endif + %if "%flavor" == "gnu-openmpi-hpc" %{?DisOMPI1} %global compiler_family gnu @@ -204,6 +209,7 @@ %if 0%{!?package_name:1} %define package_name %{hpc_package_name %_ver} %endif +%{?with_mpi:%global hpc_module_pname p%{pname}} Name: %package_name %define libname libnetcdf-fortran @@ -236,10 +242,10 @@ machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. -%if 0%{!?mpi_flavor:1} +%if %{without mpi} This package contains utility functions for working with NetCDF files. %else -This package contains the openmpi version of utility functions for +This package contains the %{mpi_flavor} version of utility functions for working with NetCDF files. %endif @@ -330,15 +336,17 @@ %build %{hpc_setup} -module load pnetcdf +module load %{?with_mpi:p}netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" +export FCFLAGS="-std=legacy" +export FFLAGS=$FCFLAGS export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" -%if 0%{?mpi_flavor:1} +%if %{with mpi} export CC="mpicc" -export FC="mpif90 -std=legacy" -export F77="mpif77 -std=legacy" +export FC="mpif90" +export F77="mpif77" %endif %hpc_configure \ --enable-shared \ @@ -353,11 +361,11 @@ %install %{hpc_setup} -module load pnetcdf +module load %{?with_mpi:p}netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" -%if 0%{?mpi_flavor:1} +%if %{with mpi} export CC="mpicc" export FC="mpif90" export F77="mpif77" @@ -396,8 +404,8 @@ # Require generic netcdf if [ expr [ module-info mode load ] || [module-info mode display ] ] { - if { ![is-loaded netcdf] } { - module load pnetcdf + if { ![is-loaded %{?with_mpi:p}netcdf] } { + module load %{?with_mpi:p}netcdf } } @@ -427,11 +435,11 @@ %if %_do_check %check %{hpc_setup} - module load pnetcdf + module load %{?with_mpi:p}netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" -%if 0%{?mpi_flavor:1} +%if 0%{with mpi} export CC="mpicc" export FC="mpif90" export F77="mpif77" ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.AWjhhG/_old 2020-07-17 20:50:22.804890871 +0200 +++ /var/tmp/diff_new_pack.AWjhhG/_new 2020-07-17 20:50:22.804890871 +0200 @@ -1,4 +1,5 @@ <multibuild> + <package>gnu-hpc</package> <package>gnu-openmpi-hpc</package> <package>gnu-openmpi2-hpc</package> <package>gnu-openmpi3-hpc</package>
