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=c3c3682ba7fc....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit ec327e91630534cc297ae0d1fcee5988a11597d9
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Oct 2 13:54:52 2017 +0200
Unset default compiler flags when tests are built
diff --git a/petsc.spec b/petsc.spec
index 1be6c40..0b06bec 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -5,7 +5,7 @@
%bcond_without check
## Debug builds ?
-%bcond_without debug
+%bcond_with debug
#
# Define _pkgdocdir macro on epel
@@ -110,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
URL:
https://www.mcs.anl.gov/petsc
Source0:
http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -381,8 +381,8 @@ 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 -Wl,-z,now -fPIC" \
+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 -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -461,8 +461,8 @@ 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 -Wl,-z,now -fPIC" \
+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 -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -523,8 +523,8 @@ 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 -Wl,-z,now -fPIC" \
+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 -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -635,8 +635,8 @@ 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 -Wl,-z,now -fPIC" \
+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 -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -917,7 +917,9 @@ export PETSC_ARCH=%{_arch}
export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes
--track-origins=yes"
make -C %{name}-%{version} test
MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/bin/petscmpiexec
-valgrind'
%else
-
+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
%endif
@@ -934,6 +936,9 @@ ln -s
%{_builddir}/%{name}-%{version}/build64/%{_arch}/lib/libpetsc64.so %{_buil
export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes
--track-origins=yes"
make -C build64 test
MPIEXEC='%{_builddir}/%{name}-%{version}/build64/bin/petscmpiexec -valgrind'
%else
+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
%endif
%endif
@@ -944,6 +949,9 @@ export
LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}:%{_builddir}/%{name}-%{version}/build
export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildopenmpi_dir
export PETSC_ARCH=%{_arch}
export MPI_INTERFACE_HOSTNAME=localhost
+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
%{_openmpi_unload}
@@ -956,6 +964,9 @@ export
LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}:%{_builddir}/%{name}-%{version}/build
export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildmpich_dir
export PETSC_ARCH=%{_arch}
export MPI_INTERFACE_HOSTNAME=localhost
+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
%{_mpich_unload}
@@ -1012,6 +1023,10 @@ make -C buildmpich_dir test
%endif
%changelog
+* Mon Oct 02 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-5
+- Disable debugging
+- Unset default compiler flags when tests are built
+
* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-4
- Rebuild for debugging
commit 9617ef11e174d85b5ab2a7bdf99e7863fa78c2b2
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Oct 1 16:55:11 2017 +0200
Rebuild for debugging
diff --git a/petsc.spec b/petsc.spec
index c65d692..1be6c40 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -5,7 +5,7 @@
%bcond_without check
## Debug builds ?
-%bcond_with debug
+%bcond_without debug
#
# Define _pkgdocdir macro on epel
@@ -110,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
URL:
https://www.mcs.anl.gov/petsc
Source0:
http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -379,8 +379,14 @@ cp -a %{name}-%{version} buildmpich_dir
%build
pushd %{name}-%{version}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%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 -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -453,8 +459,14 @@ popd
%if %{with arch64}
pushd build64
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%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 -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -509,8 +521,14 @@ popd
%if %{with openmpi}
pushd buildopenmpi_dir
%{_openmpi_load}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%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 -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -615,8 +633,14 @@ popd
%if %{with mpich}
pushd buildmpich_dir
%{_mpich_load}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%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 -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -988,6 +1012,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-4
+- Rebuild for debugging
+
* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-3
- Exclude MPI builds on s390x
commit c3c3682ba7fc4527c62364cd9e34cc868292c9ad
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Oct 1 14:29:45 2017 +0200
Exclude MPI builds on s390x
diff --git a/petsc.spec b/petsc.spec
index 4cabede..c65d692 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -14,22 +14,29 @@
#
# No MPICH support on these arches
-%if 0%{?rhel} || 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
%ifarch %{power64}
%bcond_with mpich
%endif
%endif
-%if 0%{?rhel} || 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
%ifnarch %{power64}
%bcond_without mpich
%endif
%endif
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%bcond_without mpich
-%endif
+%if 0%{?fedora}
+## Exclude MPI builds on s390x
%ifarch s390x
+%bcond_with mpich
%bcond_with openmpi
%else
+%bcond_without mpich
+%bcond_without openmpi
+%endif
+%endif
+
+%if 0%{?rhel} && 0%{?rhel} >= 7
+%bcond_without mpich
%bcond_without openmpi
%endif
@@ -39,10 +46,7 @@
## PETSC looks incompatible with serial MUMPS
%bcond_with mumps_serial
#
-## Does not build with SuperLU < 5.2.0
-%if 0%{?fedora} >= 25
%bcond_without superlu
-%endif
#
## SuperLUDIST needs parmetis
@@ -64,25 +68,12 @@
%{!?el6:%global with_suitesparse 1}
#
-## PETSc needs fftw's MPI implementation
-%if 0%{?fedora} >= 25
-%bcond_without fftw
-%else
-%bcond_with fftw
-%endif
-#
-
# 'scalapack' is required by 'mumps'
%if %{with openmpi}
%bcond_without mpi
%bcond_without sundials
-%ifarch s390x
-%bcond_with scalapack
-%bcond_with mumps
-%else
%bcond_without scalapack
%bcond_without mumps
-%endif
%bcond_without ptscotch
%bcond_without hypre
%endif
@@ -90,13 +81,8 @@
%if %{with mpich}
%bcond_without mpi
%bcond_without sundials
-%ifarch s390x
-%bcond_with scalapack
-%bcond_with mumps
-%else
%bcond_without scalapack
%bcond_without mumps
-%endif
%bcond_without ptscotch
%bcond_without hypre
%endif
@@ -124,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
URL:
https://www.mcs.anl.gov/petsc
Source0:
http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -1002,6 +988,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-3
+- Exclude MPI builds on s390x
+
* Sat Sep 30 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-2
- Enable mpiuni-fortran-binding on MPI builds
commit 4983e8c181bfd8fe34ce56195b1cbba5033fb5dd
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Sep 30 17:37:38 2017 +0200
Enable mpiuni-fortran-binding on MPI builds
diff --git a/petsc.spec b/petsc.spec
index 33e7c83..4cabede 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -124,7 +124,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-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
@@ -569,7 +569,7 @@ pushd buildopenmpi_dir
--with-mpi=1 \
--with-mpi-compilers=$MPI_BIN/mpicc \
--with-mpiexec=$MPI_BIN/mpiexec \
- --with-mpiuni-fortran-binding=0 \
+ --with-mpiuni-fortran-binding=1 \
%endif
%if %{with cgns}
--with-cgns=1 \
@@ -675,7 +675,7 @@ pushd buildmpich_dir
--with-mpi=1 \
--with-mpi-compilers=$MPI_BIN/mpicc \
--with-mpiexec=$MPI_BIN/mpiexec \
- --with-mpiuni-fortran-binding=0 \
+ --with-mpiuni-fortran-binding=1 \
%endif
%if %{with cgns}
--with-cgns=1 \
@@ -1002,6 +1002,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sat Sep 30 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-2
+- Enable mpiuni-fortran-binding on MPI builds
+
* Tue Sep 26 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-1
- Update to 3.7.7
- Move petscvariables/petscrules under a private directory of libdir