Accepting request 519473 from home:frispete:branches:science

- fix compiler flag substitution

OBS-URL: https://build.opensuse.org/request/show/519473
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=42
This commit is contained in:
Atri Bhattacharya 2017-08-30 09:38:21 +00:00 committed by Git OBS Bridge
parent 56171e9be1
commit 427eaa5f44
2 changed files with 21 additions and 15 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 29 12:03:27 UTC 2017 - hpj@urpla.net
- fix compiler flag substitution
-------------------------------------------------------------------
Mon Jul 3 12:53:05 UTC 2017 - badshah400@gmail.com

View File

@ -159,8 +159,8 @@ with HDF5 files.
%package -n libhdf5-%{sonum}
Summary: Shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5 = %{version}
Obsoletes: libhdf5 < %{version}
@ -186,8 +186,8 @@ This package contains the HDF5 runtime libraries.
%package -n libhdf5-%{sonum}-openmpi
Summary: Shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5-openmpi = %{version}
Obsoletes: libhdf5-openmpi < %{version}
@ -213,8 +213,8 @@ This package contains the openmpi version of the HDF5 runtime libraries.
%package -n libhdf5-%{sonum}-mvapich2
Summary: Shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5-mvapich2 = %{version}
Obsoletes: libhdf5-mvapich2 < %{version}
@ -240,8 +240,8 @@ This package contains the mvapich2 version of the HDF5 runtime libraries.
%package -n libhdf5_hl%{sonum_HL}
Summary: High-level shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5_hl = %{version}
Obsoletes: libhdf5_hl < %{version}
@ -267,8 +267,8 @@ This package contains the the high-level HDF5 runtime libraries.
%package -n libhdf5_hl%{sonum_HL}-openmpi
Summary: High-level shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5_hl-openmpi = %{version}
Obsoletes: libhdf5_hl-openmpi < %{version}
@ -295,8 +295,8 @@ runtime libraries.
%package -n libhdf5_hl%{sonum_HL}-mvapich2
Summary: High-level shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5_hl-mvapich2 = %{version}
Obsoletes: libhdf5_hl-mvapich2 < %{version}
@ -323,8 +323,8 @@ runtime libraries.
%package -n libhdf5_cpp%{sonum_CXX}
Summary: Shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5_cpp = %{version}
Obsoletes: libhdf5_cpp < %{version}
@ -350,8 +350,8 @@ This package contains the HDF5 runtime libraries.
%package -n libhdf5_hl_cpp%{sonum_HL_CXX}
Summary: High-level shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5_hl_cpp = %{version}
Obsoletes: libhdf5_hl_cpp < %{version}
@ -377,8 +377,8 @@ This package contains the the high-level HDF5 runtime libraries.
%package -n libhdf5_fortran%{sonum_F}
Summary: Shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5_fortran = %{version}
Obsoletes: libhdf5_fortran < %{version}
@ -404,8 +404,8 @@ This package contains the HDF5 runtime libraries.
%package -n libhdf5_fortran%{sonum_F}-openmpi
Summary: Shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5_fortran-openmpi = %{version}
Obsoletes: libhdf5_fortran-openmpi < %{version}
@ -431,8 +431,8 @@ This package contains the openmpi version of the HDF5 runtime libraries.
%package -n libhdf5_fortran%{sonum_F}-mvapich2
Summary: Shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5_fortran-mvapich2 = %{version}
Obsoletes: libhdf5_fortran-mvapich2 < %{version}
@ -458,8 +458,8 @@ This package contains the mvapich2 version of the HDF5 runtime libraries.
%package -n libhdf5hl_fortran%{sonum_HL_F}
Summary: High-level shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5hl_fortran = %{version}
Obsoletes: libhdf5hl_fortran < %{version}
@ -485,8 +485,8 @@ This package contains the the high-level HDF5 runtime libraries.
%package -n libhdf5hl_fortran%{sonum_HL_F}-openmpi
Summary: High-level shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5hl_fortran-openmpi = %{version}
Obsoletes: libhdf5hl_fortran-openmpi < %{version}
@ -513,8 +513,8 @@ runtime libraries.
%package -n libhdf5hl_fortran%{sonum_HL_F}-mvapich2
Summary: High-level shared libraries for the HDF5 scientific data format
Group: Productivity/Scientific/Other
# To avoid unresolvable errors due to multiple providers of the library
Group: Productivity/Scientific/Other
Provides: libhdf5hl_fortran-mvapich2 = %{version}
Obsoletes: libhdf5hl_fortran-mvapich2 < %{version}
@ -793,9 +793,10 @@ done
export CC=gcc
export CXX=g++
export F9X=gfortran
export CFLAGS="%{optflags}"
# workaround for known gcc issue, see RELEASE.txt
if gcc --version |grep -q " 4\.[68]"; then
export CFLAGS="%{optflags}/-O2/-O0}"
export CFLAGS="${CFLAGS/-O2/-O0}"
fi
%ifarch %arm
# we want to have useful H5_CFLAGS on arm too