The package rpms/petsc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/petsc.git/commit/?id=90935f524f78....
Change:
+%ifnarch %{ix86} %{arm}
Thanks.
Full change:
============
commit 90935f524f78c71beeec9ccd2db7faa274e51e58
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Oct 15 14:07:00 2018 +0200
Disable check of OpenMPI libraries on x86 temporarely
diff --git a/petsc.spec b/petsc.spec
index 940ba1a..42ef679 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -1,6 +1,3 @@
-# default harden flags breaks gfortran work
-%undefine _hardened_build
-
# Testing ?
%bcond_without check
@@ -401,10 +398,10 @@ cp -a %{name}-%{version} buildmpich_dir
pushd %{name}-%{version}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now"
FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g
-Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC
-I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS" \
+CFLAGS="-O0 -g -Wl,-z,now -fPIC" CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now
-I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -fPIC" \
%else
-CFLAGS="$CFLAGS -O3" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS
-O3" LDFLAGS="$LDFLAGS" \
+CFLAGS="$CFLAGS -O3 -fPIC" CXXFLAGS="$CXXFLAGS -O3 -fPIC"
FFLAGS="$FFLAGS -O3 -fPIC" LDFLAGS="$LDFLAGS -fPIC" \
COPTFLAGS="$CFLAGS" CXXOPTFLAGS="$CXXFLAGS"
FOPTFLAGS="$FFLAGS" \
%endif
--CC_LINKER_FLAGS="$LDFLAGS -lgfortran" \
@@ -488,10 +485,10 @@ popd
pushd build64
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now"
FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g
-Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC
-I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS" \
+CFLAGS="-O0 -g -Wl,-z,now -fPIC" CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC
-I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -fPIC" \
%else
-CFLAGS="$CFLAGS -O3" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS
-O3" LDFLAGS="$LDFLAGS" \
+CFLAGS="$CFLAGS -O3 -fPIC" CXXFLAGS="$CXXFLAGS -O3 -fPIC"
FFLAGS="$FFLAGS -O3 -fPIC" LDFLAGS="$LDFLAGS -fPIC" \
COPTFLAGS="$CFLAGS" CXXOPTFLAGS="$CXXFLAGS"
FOPTFLAGS="$FFLAGS" \
%endif
--CC_LINKER_FLAGS="$LDFLAGS -lgfortran" \
@@ -552,10 +549,10 @@ pushd buildopenmpi_dir
%{_openmpi_load}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now"
FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g
-Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC
-I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS" \
+CFLAGS="-O0 -g -Wl,-z,now -fPIC" CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC
-I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -fPIC" \
%else
-CFLAGS="$CFLAGS -O3" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS
-O3" LDFLAGS="$LDFLAGS" \
+CFLAGS="$CFLAGS -O3 -fPIC" CXXFLAGS="$CXXFLAGS -O3 -fPIC"
FFLAGS="$FFLAGS -O3 -fPIC" LDFLAGS="$LDFLAGS -fPIC" \
COPTFLAGS="$CFLAGS" CXXOPTFLAGS="$CXXFLAGS"
FOPTFLAGS="$FFLAGS" \
%endif
--CC_LINKER_FLAGS="$LDFLAGS -lgfortran -L$MPI_LIB -lmpi_mpifh" \
@@ -666,10 +663,10 @@ pushd buildmpich_dir
%{_mpich_load}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now"
FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g
-Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC
-I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS" \
+CFLAGS="-O0 -g -Wl,-z,now -fPIC" CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC
-I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -fPIC" \
%else
-CFLAGS="$CFLAGS -O3" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS
-O3" LDFLAGS="$LDFLAGS" \
+CFLAGS="$CFLAGS -O3 -fPIC" CXXFLAGS="$CXXFLAGS -O3 -fPIC"
FFLAGS="$FFLAGS -O3 -fPIC" LDFLAGS="$LDFLAGS -fPIC" \
COPTFLAGS="$CFLAGS" CXXOPTFLAGS="$CXXFLAGS"
FOPTFLAGS="$FFLAGS" \
%endif
--CC_LINKER_FLAGS="$LDFLAGS -lgfortran -L$MPI_LIB -lmpichf90" \
@@ -959,7 +956,7 @@ export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes
--track-origins=
export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
-make -C %{name}-%{version} test
MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/bin/petscmpiexec
-valgrind'
+make -C %{name}-%{version} test
MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/lib/petsc/bin/petscmpiexec
-valgrind'
%else
make -C %{name}-%{version} test
%endif
@@ -978,13 +975,14 @@ export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes
--track-origins=
export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
-make -C build64 test
MPIEXEC='%{_builddir}/%{name}-%{version}/build64/bin/petscmpiexec -valgrind'
+make -C build64 test
MPIEXEC='%{_builddir}/%{name}-%{version}/build64/lib/petsc/bin/petscmpiexec
-valgrind'
%else
make -C build64 test
%endif
%endif
%if %{with openmpi}
+%ifnarch %{ix86} %{arm}
%{_openmpi_load}
export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/buildopenmpi_dir/%{_arch}/lib
export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildopenmpi_dir
@@ -995,12 +993,13 @@ export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes
--track-origins=
export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
-make -C buildopenmpi_dir test
MPIEXEC='%{_builddir}/%{name}-%{version}/buildopenmpi_dir/bin/petscmpiexec
-valgrind'
+make -C buildopenmpi_dir test
MPIEXEC='%{_builddir}/%{name}-%{version}/buildopenmpi_dir/lib/petsc/bin/petscmpiexec
-valgrind'
%else
make -C buildopenmpi_dir test
%endif
%{_openmpi_unload}
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel} >= 7
%if %{with mpich}
@@ -1014,7 +1013,7 @@ export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes
--track-origins=
export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
-make -C buildmpich_dir test
MPIEXEC='%{_builddir}/%{name}-%{version}/buildmpich_dir/bin/petscmpiexec
-valgrind'
+make -C buildmpich_dir test
MPIEXEC='%{_builddir}/%{name}-%{version}/buildmpich_dir/lib/petsc/bin/petscmpiexec
-valgrind'
%else
make -C buildmpich_dir test
%endif
@@ -1086,6 +1085,7 @@ make -C buildmpich_dir test
%changelog
* Sat Oct 13 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.10.2-1
- Update to 3.10.2
+- Disable check of OpenMPI libraries on x86 temporarely
* Fri Aug 03 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.9.3-4
- Fix conditional macros for MPI builds