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=9d9cb3da2a40....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 9d9cb3da2a40b14f098b4447c0dbb1ca12458e81
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Jul 22 23:25:05 2019 +0200
Rebuild for MUMPS-5.2.1
diff --git a/petsc.spec b/petsc.spec
index e7e4ad9..d92cd96 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -9,33 +9,26 @@
%{?el7:%global _pkgdocdir %{_docdir}/%{name}}
#
-# No MPICH support on these arches
-%if 0%{?rhel} && 0%{?rhel} < 7
-%ifarch %{power64}
-%bcond_with mpich
-%endif
-%endif
-%if 0%{?rhel} && 0%{?rhel} < 7
-%ifnarch %{power64}
-%bcond_without mpich
-%endif
-%endif
-## Exclude MPI builds on s390x
-%ifarch s390x
+%if 0%{?fedora}
%bcond_without mpich
%bcond_with openmpi
%endif
-%ifnarch s390x
-%bcond_without mpich
-%bcond_without openmpi
+
+%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64
+%bcond_with arch64
+%else
+%bcond_with arch64
%endif
-%bcond_without mpich
-%bcond_without openmpi
+%bcond_without blas
+%if %{with arch64}
+%bcond_without blas64
+%endif
%if 0%{?rhel} && 0%{?rhel} >= 7
%bcond_without mpich
%bcond_without openmpi
+%global dts devtoolset-8-
%endif
#
@@ -79,23 +72,12 @@
%bcond_without hypre
%endif
-%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64
-%bcond_without arch64
-%else
-%bcond_with arch64
-%endif
-
-%bcond_without blas
-%if %{with arch64}
-%bcond_without blas64
-%endif
-
%global releasever 3.11
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: %{releasever}.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
URL:
https://www.mcs.anl.gov/petsc
Source0:
http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -130,11 +112,11 @@ BuildRequires: suitesparse-devel
%if %{with blas}
BuildRequires: openblas-devel, openblas-srpm-macros
%endif
-BuildRequires: gcc, gcc-c++, cmake3
-BuildRequires: gcc-gfortran
+BuildRequires: %{?dts}gcc, %{?dts}gcc-c++, cmake3
+BuildRequires: %{?dts}gcc-gfortran
BuildRequires: libX11-devel
%{?fedora:BuildRequires: python3-devel}
-%{?rhel:BuildRequires: python%{python3_pkgversion}-devel}
+%{?rhel:BuildRequires: python2-devel}
BuildRequires: pcre-devel
%if 0%{?rhel}
BuildRequires: pkgconfig
@@ -164,7 +146,7 @@ Portable Extensible Toolkit for Scientific Computation (developer
files).
%package doc
Summary: Portable Extensible Toolkit for Scientific Computation (documentation files)
%{?fedora:BuildRequires: python3-sphinx}
-%{?rhel:BuildRequires: python%{python3_pkgversion}-sphinx}
+%{?rhel:BuildRequires: python2-sphinx}
BuildArch: noarch
%description doc
Portable Extensible Toolkit for Scientific Computation.
@@ -316,10 +298,13 @@ Portable Extensible Toolkit for Scientific Computation (developer
files).
%setup -q -c
pushd %{name}-%{version}
+
+%if 0%{?fedora}
find . -name 'setup.py' | xargs sed -i '1s|^#!/usr/bin/env
python|#!%{__python3}|'
find . -name 'configure' | xargs sed -i '1s|^#!/usr/bin/env
python|#!%{__python3}|'
find config -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env
python|#!%{__python3}|'
find src/benchmarks/streams -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env
python|#!%{__python3}|'
+%endif
%patch3 -p0
@@ -349,7 +334,12 @@ cp -a %{name}-%{version} buildmpich_dir
%build
pushd %{name}-%{version}
-%configure \
+%if 0%{?rhel}
+%{?dts:source /opt/rh/devtoolset-8/enable}
+%configure --with-cc=/opt/rh/devtoolset-8/root/usr/bin/gcc
--with-cxx=/opt/rh/devtoolset-8/root/usr/bin/g++
--with-fc=/opt/rh/devtoolset-8/root/usr/bin/gfortran \
+%else
+%configure --with-cc=gcc --with-cxx=g++ --with-fc=gfortran \
+%endif
%if %{with debug}
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" \
@@ -357,7 +347,7 @@ CFLAGS="-O0 -g -Wl,-z,now -fPIC" CXXFLAGS="-O0 -g
-Wl,-z,now -fPIC" FFLAGS="-O0
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" \
+ --CC_LINKER_FLAGS="$LDFLAGS" \
--FC_LINKER_FLAGS="$LDFLAGS -lgfortran" \
--with-default-arch=0 --with-make=1 \
--with-cmake-exec=%{_bindir}/cmake3 --with-ctest-exec=%{_bindir}/ctest3 \
@@ -422,6 +412,7 @@ CFLAGS="$CFLAGS -O3 -fPIC" CXXFLAGS="$CXXFLAGS -O3
-fPIC" FFLAGS="$FFLAGS -O3 -f
%endif
--with-pthread=1 \
--with-valgrind=1
+##
RPM_BUILD_NCPUS="`%{_bindir}/getconf _NPROCESSORS_ONLN`"
make \
@@ -430,7 +421,12 @@ popd
%if %{with arch64}
pushd build64
-%configure \
+%if 0%{?rhel}
+%{?dts:source /opt/rh/devtoolset-8/enable}
+%configure --with-cc=/opt/rh/devtoolset-8/root/usr/bin/gcc
--with-cxx=/opt/rh/devtoolset-8/root/usr/bin/g++
--with-fc=/opt/rh/devtoolset-8/root/usr/bin/gfortran \
+%else
+%configure --with-cc=gcc --with-cxx=g++ --with-fc=gfortran \
+%endif
%if %{with debug}
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" \
@@ -438,7 +434,7 @@ CFLAGS="-O0 -g -Wl,-z,now -fPIC" CXXFLAGS="-O0 -g
-Wl,-z,now -fPIC" FFLAGS="-O0
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" \
+ --CC_LINKER_FLAGS="$LDFLAGS" \
--FC_LINKER_FLAGS="$LDFLAGS -lgfortran" \
--with-default-arch=0 --with-make=1 \
--with-cmake-exec=%{_bindir}/cmake3 --with-ctest-exec=%{_bindir}/ctest3 \
@@ -487,6 +483,7 @@ popd
%if %{with openmpi}
pushd buildopenmpi_dir
+
%{_openmpi_load}
%configure \
%if %{with debug}
@@ -496,8 +493,8 @@ CFLAGS="-O0 -g -Wl,-z,now -fPIC" CXXFLAGS="-O0 -g
-Wl,-z,now -fPIC" FFLAGS="-O0
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" \
- --FC_LINKER_FLAGS=" -lgfortran" \
+ --CC_LINKER_FLAGS="$LDFLAGS" \
+ --FC_LINKER_FLAGS="$LDFLAGS -lgfortran" \
--with-default-arch=0 --with-make=1 \
--with-cmake-exec=%{_bindir}/cmake3 --with-ctest-exec=%{_bindir}/ctest3 \
--with-single-library=1 \
@@ -604,8 +601,8 @@ CFLAGS="-O0 -g -Wl,-z,now -fPIC" CXXFLAGS="-O0 -g
-Wl,-z,now -fPIC" FFLAGS="-O0
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" \
- --FC_LINKER_FLAGS=" -lgfortran" \
+ --CC_LINKER_FLAGS="$LDFLAGS" \
+ --FC_LINKER_FLAGS="$LDFLAGS -lgfortran" \
--with-default-arch=0 --with-make=1 \
--with-cmake-exec=%{_bindir}/cmake3 --with-ctest-exec=%{_bindir}/ctest3 \
--with-single-library=1 \
@@ -1006,6 +1003,10 @@ make -C buildmpich_dir test
%endif
%changelog
+* Fri Jul 19 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 3.11.3-2
+- Rebuild for MUMPS-5.2.1
+- Use Python 2 on EPEL
+
* Thu Jun 27 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 3.11.3-1
- Release 3.11.3