Use flexiblas and "-fallow-argument-mismatch -fcommon" on EL9+

This commit is contained in:
Orion Poplawski 2021-02-01 21:48:27 -07:00
parent 2978f25ad3
commit 65a0d30824

View File

@ -1,4 +1,4 @@
%if 0%{?fedora} >= 33
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
%bcond_without flexiblas
%endif
%if %{with flexiblas}
@ -9,7 +9,7 @@
Name: ncl
Version: 6.6.2
Release: 17%{?dist}
Release: 18%{?dist}
Summary: NCAR Command Language and NCAR Graphics
License: BSD
@ -184,7 +184,7 @@ sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex\([^ ;]*\);loadscript(ncargpath("
#make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC -Werror-implicit-function-declaration" F77=gfortran F77_LD=gfortran\
FCOPTIONS="$RPM_OPT_FLAGS -fPIC -fno-second-underscore -fno-range-check -fopenmp"
%if 0%{?fedora} >= 32
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
FCOPTIONS="$FCOPTIONS -fallow-argument-mismatch -fcommon"
%endif
make Build CCOPTIONS="$RPM_OPT_FLAGS -std=c99 -fPIC -fno-strict-aliasing -fopenmp -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H -fcommon" \
@ -356,6 +356,9 @@ done
%changelog
* Mon Feb 1 2021 Orion Poplawski <orion@nwra.com> - 6.6.2-18
- Use flexiblas and "-fallow-argument-mismatch -fcommon" on EL9+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild