From 65a0d30824cc4a60ce954d55b9523964ca71d9fd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 1 Feb 2021 21:48:27 -0700 Subject: [PATCH] Use flexiblas and "-fallow-argument-mismatch -fcommon" on EL9+ --- ncl.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ncl.spec b/ncl.spec index 5035dda..1cb18a8 100644 --- a/ncl.spec +++ b/ncl.spec @@ -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 - 6.6.2-18 +- Use flexiblas and "-fallow-argument-mismatch -fcommon" on EL9+ + * Tue Jan 26 2021 Fedora Release Engineering - 6.6.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild