disable i686 and s390x again (still fail test suite). Also add -fPIC which seems required to get the library compiled on armv7hl.

This commit is contained in:
Jos de Kloe 2020-10-17 11:37:19 +02:00
parent 4ef87b9983
commit d7452732f0

View File

@ -90,9 +90,9 @@ Obsoletes: grib_api < %{final_grib_api_version}
%endif
# as explained in bugzilla #1562066
#ExcludeArch: i686
ExcludeArch: i686
# as explained in bugzilla #1562076
#ExcludeArch: s390x
ExcludeArch: s390x
# as explained in bugzilla #1562084
#ExcludeArch: armv7hl
@ -229,6 +229,11 @@ chmod 644 AUTHORS LICENSE
# export FCFLAGS="%%{build_fflags} -fallow-argument-mismatch"
# defining the -DCMAKE_Fortran_FLAGS for camke is required to let it compile.
# added -DCMAKE_Fortran_FLAGS="-fPIC"
# because the koji build crashes with the error that it needs this setting
# when I try to build for armv7hl (other archs do not complain ......)
# I have no idea what causes this difference in behaviour.
%cmake3 -DINSTALL_LIB_DIR=%{_lib} \
-DENABLE_ECCODES_OMP_THREADS=ON \
-DENABLE_EXTRA_TESTS=ON \
@ -240,6 +245,7 @@ chmod 644 AUTHORS LICENSE
-DECCODES_SOVERSION=%{so_version} \
-DECCODES_SOVERSION_F90=%{so_version_f90} \
-DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \
-DCMAKE_Fortran_FLAGS="-fPIC" \
-DENABLE_PYTHON=OFF
# note the final '..' is no longer needed to the cmake3 call.