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=c81b773ea60d....
Change:
+%ifnarch %{openblas_arches}
Thanks.
Full change:
============
commit 03de1123525e5417a1a358a1e0d42cebde08b6ec
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Nov 22 12:52:18 2017 +0100
Update to 3.8.1
diff --git a/.gitignore b/.gitignore
index 9609c47..02c571c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/petsc-3.7.6.tar.gz
/petsc-3.7.7.tar.gz
/petsc-3.8.0.tar.gz
+/petsc-3.8.1.tar.gz
diff --git a/petsc.spec b/petsc.spec
index 95b9f72..cb48cd7 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -84,6 +84,7 @@
%bcond_without mpi
# Unexpectedly 'configure' does not recognize Sundials libraries
# Linker fails with 'conftest'
+# PETSC is incompatible with Sundials 3.0.0
%bcond_with sundials
%bcond_without scalapack
%bcond_without mumps
@@ -95,6 +96,7 @@
%bcond_without mpi
# Unexpectedly 'configure' does not recognize Sundials libraries
# Linker fails with 'conftest'
+# PETSC is incompatible with Sundials 3.0.0
%bcond_with sundials
%bcond_without scalapack
%bcond_without mumps
@@ -109,7 +111,7 @@
%if 0%{?el6}
%bcond_with arch64
%else
-%bcond_without arch64
+%bcond_with arch64
%endif
%else
%bcond_with arch64
@@ -126,8 +128,8 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
-Version: %{releasever}.0
-Release: 5%{?dist}
+Version: %{releasever}.1
+Release: 1%{?dist}
License: BSD
URL:
https://www.mcs.anl.gov/petsc
Source0:
http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -138,7 +140,7 @@ Patch0: %{name}-%{releasever}-no-rpath.patch
## Rename library name for 64-bit integer package
Patch1: %{name}-lib64.patch
-# Diable checkopts and petscnagupgrade.py
+# Disable checkopts and petscnagupgrade.py
Patch3: %{name}-disable_petscnagupgrade.patch
%if %{with superlu}
@@ -147,12 +149,12 @@ BuildRequires: SuperLU-devel >= 5.2.0
%if %{with superlumt}
BuildRequires: SuperLUMT-devel
%endif
-%if %{with sundials}
-BuildRequires: sundials-devel
-%endif
%if %{with mumps_serial}
BuildRequires: MUMPS-devel
%endif
+%if %{with sundials_serial}
+BuildRequires: sundials-devel
+%endif
%if 0%{?with_suitesparse}
BuildRequires: suitesparse-devel
%endif
@@ -450,6 +452,11 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
--with-suitesparse-include=%{_includedir}/suitesparse \
--with-suitesparse-lib="-lumfpack -lklu -lcholmod -lamd" \
%endif
+%if %{with sundials_serial}
+ --with-sundials=1 \
+ --with-sundials-include= \
+ --with-sundials-lib="-lsundials_nvecserial -lsundials_cvode" \
+%endif
%if %{with superlu}
--with-superlu=1 \
--with-superlu-include=%{_includedir}/SuperLU \
@@ -601,8 +608,8 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
%endif
%if %{with sundials}
--with-sundials=1 \
- --with-sundials-include= \
- --with-sundials-lib=-lsundials_nvecparallel \
+ --with-sundials-include=$MPI_INCLUDE \
+ --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel" \
%endif
%if %{with superludist}
--with-superlu_dist=1 \
@@ -712,8 +719,8 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
%endif
%if %{with sundials}
--with-sundials=1 \
- --with-sundials-include= \
- --with-sundials-lib=-lsundials_nvecparallel \
+ --with-sundials-include=$MPI_INCLUDE \
+ --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel" \
%endif
%if %{with superludist}
--with-superlu_dist=1 \
@@ -1038,6 +1045,11 @@ make -C buildmpich_dir test
%endif
%changelog
+* Wed Nov 22 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.1-1
+- Update to 3.8.1
+- Disable Sundials
+- Enable MUMPS on serial build
+
* Mon Nov 13 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-5
- Install .mod files (bz#1212557)
diff --git a/sources b/sources
index f32c298..0c5d4a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (petsc-3.8.0.tar.gz) =
66d186e8facb17d29c0b690646c29903d0afe3d2f7ef89a94f406ebceeb11e265b07ab605dd8ac4bd98929b3a48475ed3179733a1117187318e50bc64473fba1
+SHA512 (petsc-3.8.1.tar.gz) =
8480265e80574434252961b788602e2667d1aede48d5c80b34719895e644767bc5bc2e09deaba5ca825f7871df801e2efbb7ec1b114183aeb9376b42b77ba74e
commit d9c67c4ab5ca615d75ba78e0b6b8710278622b05
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Nov 13 20:20:47 2017 +0100
Install .mod files (bz#1212557)
diff --git a/petsc.spec b/petsc.spec
index ad31e95..95b9f72 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -127,7 +127,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: %{releasever}.0
-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
@@ -748,14 +748,16 @@ popd
%install
pushd %{name}-%{version}
mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT%{_libdir}
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so.%{releasever}
-install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
-cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
+install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/
+install -pm 644 %{_arch}/include/*.mod $RPM_BUILD_ROOT%{_fmoddir}/%{name}/
+cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}/
install -pm 644 %{_arch}/lib/petsc/conf/petscrules
$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/
install -pm 644 %{_arch}/lib/petsc/conf/petscvariables
$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/
@@ -793,14 +795,16 @@ EOF
%if %{with arch64}
pushd build64
mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}/%{name}64
+mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/%{name}64
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc64.* $RPM_BUILD_ROOT%{_libdir}
ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so
ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so.%{releasever}
-install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}64
-cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
+install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}64/
+install -pm 644 %{_arch}/include/*.mod $RPM_BUILD_ROOT%{_fmoddir}/%{name}64/
+cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}64/
install -pm 644 %{_arch}/lib/petsc/conf/petscrules
$RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/
install -pm 644 %{_arch}/lib/petsc/conf/petscvariables
$RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/
@@ -840,14 +844,16 @@ EOF
pushd buildopenmpi_dir
%{_openmpi_load}
mkdir -p $RPM_BUILD_ROOT$MPI_LIB $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+mkdir -p $RPM_BUILD_ROOT$MPI_FORTRAN_MOD_DIR/%{name}
mkdir -p $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.%{releasever}
-install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
-cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}/
+install -pm 644 %{_arch}/include/*.mod $RPM_BUILD_ROOT$MPI_FORTRAN_MOD_DIR/%{name}/
+cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}/
install -pm 644 %{_arch}/lib/petsc/conf/petscrules
$RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
install -pm 644 %{_arch}/lib/petsc/conf/petscvariables
$RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
@@ -865,14 +871,16 @@ popd
pushd buildmpich_dir
%{_mpich_load}
mkdir -p $RPM_BUILD_ROOT$MPI_LIB $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+mkdir -p $RPM_BUILD_ROOT$MPI_FORTRAN_MOD_DIR/%{name}
mkdir -p $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.%{releasever}
-install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
-cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}/
+install -pm 644 %{_arch}/include/*.mod $RPM_BUILD_ROOT$MPI_FORTRAN_MOD_DIR/%{name}/
+cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}/
install -pm 644 %{_arch}/lib/petsc/conf/petscrules
$RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
install -pm 644 %{_arch}/lib/petsc/conf/petscvariables
$RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
@@ -986,6 +994,7 @@ make -C buildmpich_dir test
%{_libdir}/%{name}-%{version}/
%{_libdir}/libpetsc.so
%{_includedir}/%{name}/
+%{_fmoddir}/%{name}/
%files doc
%license %{name}-%{version}/LICENSE
@@ -1001,6 +1010,7 @@ make -C buildmpich_dir test
%{_libdir}/%{name}64-%{version}/
%{_libdir}/libpetsc64.so
%{_includedir}/%{name}64/
+%{_fmoddir}/%{name}64/
%endif
%if %{with openmpi}
@@ -1012,6 +1022,7 @@ make -C buildmpich_dir test
%{_libdir}/openmpi/lib/libpetsc.so
%{_libdir}/openmpi/lib/%{name}-%{version}/
%{_includedir}/openmpi-%{_arch}/%{name}/
+%{_fmoddir}/openmpi/%{name}/
%endif
%if %{with mpich}
@@ -1023,9 +1034,13 @@ make -C buildmpich_dir test
%{_libdir}/mpich/lib/libpetsc.so
%{_libdir}/mpich/lib/%{name}-%{version}/
%{_includedir}/mpich-%{_arch}/%{name}/
+%{_fmoddir}/mpich/%{name}/
%endif
%changelog
+* Mon Nov 13 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-5
+- Install .mod files (bz#1212557)
+
* Thu Nov 09 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-4
- Fix soname version
commit 9d6eb5272afb2434debe099b8057d434dffd3b76
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Nov 9 19:31:48 2017 +0100
Fix soname version
diff --git a/petsc-3.7-no-rpath.patch b/petsc-3.7-no-rpath.patch
deleted file mode 100644
index da5b32a..0000000
--- a/petsc-3.7-no-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- config/BuildSystem/config/setCompilers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- config/BuildSystem/config/setCompilers.py
-+++ config/BuildSystem/config/setCompilers.py
-@@ -1387,7 +1387,7 @@
- self.pushLanguage(language)
- # test '-R' before '-rpath' as sun compilers [c,fortran] don't
give proper errors with wrong options.
- if not Configure.isDarwin(self.log):
-- testFlags = ['-Wl,-rpath,', '-R','-rpath ' ,
'-Wl,-R,']
-+ testFlags = []
- else:
- testFlags = ['-Wl,-rpath,']
- # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux
accepts -Wl,-rpath, but f90 & CC do not.
diff --git a/petsc-3.8-no-rpath.patch b/petsc-3.8-no-rpath.patch
new file mode 100644
index 0000000..da5b32a
--- /dev/null
+++ b/petsc-3.8-no-rpath.patch
@@ -0,0 +1,15 @@
+---
+ config/BuildSystem/config/setCompilers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- config/BuildSystem/config/setCompilers.py
++++ config/BuildSystem/config/setCompilers.py
+@@ -1387,7 +1387,7 @@
+ self.pushLanguage(language)
+ # test '-R' before '-rpath' as sun compilers [c,fortran] don't
give proper errors with wrong options.
+ if not Configure.isDarwin(self.log):
+- testFlags = ['-Wl,-rpath,', '-R','-rpath ' ,
'-Wl,-R,']
++ testFlags = []
+ else:
+ testFlags = ['-Wl,-rpath,']
+ # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux
accepts -Wl,-rpath, but f90 & CC do not.
diff --git a/petsc.spec b/petsc.spec
index 4f8562e..ad31e95 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -82,6 +82,8 @@
# 'scalapack' is required by 'mumps'
%if %{with openmpi}
%bcond_without mpi
+# Unexpectedly 'configure' does not recognize Sundials libraries
+# Linker fails with 'conftest'
%bcond_with sundials
%bcond_without scalapack
%bcond_without mumps
@@ -91,6 +93,8 @@
%if %{with mpich}
%bcond_without mpi
+# Unexpectedly 'configure' does not recognize Sundials libraries
+# Linker fails with 'conftest'
%bcond_with sundials
%bcond_without scalapack
%bcond_without mumps
@@ -118,16 +122,18 @@
%bcond_without blas64
%endif
+%global releasever 3.8
+
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
-Version: 3.8.0
-Release: 3%{?dist}
+Version: %{releasever}.0
+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
## Remove rpath flags
-Patch0: %{name}-3.7-no-rpath.patch
+Patch0: %{name}-%{releasever}-no-rpath.patch
## Rename library name for 64-bit integer package
Patch1: %{name}-lib64.patch
@@ -746,7 +752,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT%{_libdir}
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so
-ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so.3.7
+ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so.%{releasever}
install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -791,7 +797,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc64.* $RPM_BUILD_ROOT%{_libdir}
ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so
-ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so.3.7
+ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so.%{releasever}
install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}64
cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -838,7 +844,7 @@ mkdir -p $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so
-ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.3.7
+ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.%{releasever}
install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
@@ -863,7 +869,7 @@ mkdir -p $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB
ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so
-ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.3.7
+ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.%{releasever}
install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
@@ -1020,6 +1026,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Thu Nov 09 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-4
+- Fix soname version
+
* Wed Nov 08 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-3
- Rebuild for hypre-2.13.0
- Disable sundials on MPI builds
commit e72e997590d2351c89517ff1b20fb6738ed81f4f
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Nov 9 17:40:45 2017 +0100
Disable sundials on MPI builds
diff --git a/petsc.spec b/petsc.spec
index ac2d6ac..4f8562e 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -82,7 +82,7 @@
# 'scalapack' is required by 'mumps'
%if %{with openmpi}
%bcond_without mpi
-%bcond_without sundials
+%bcond_with sundials
%bcond_without scalapack
%bcond_without mumps
%bcond_without ptscotch
@@ -91,7 +91,7 @@
%if %{with mpich}
%bcond_without mpi
-%bcond_without sundials
+%bcond_with sundials
%bcond_without scalapack
%bcond_without mumps
%bcond_without ptscotch
@@ -385,8 +385,8 @@ pushd %{name}-%{version}
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" \
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules"
LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
@@ -431,7 +431,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
%if %{with mumps_serial}
--with-mumps-serial=1 \
--with-mumps-include=%{_includedir}/MUMPS \
- --with-mumps-lib="-lmumps_common -ldmumps -lpord" \
+ --with-mumps-lib=-ldmumps \
%endif
--with-mpi=0 \
--with-x=1 \
@@ -464,8 +464,8 @@ pushd build64
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" \
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules"
LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
@@ -525,8 +525,8 @@ pushd buildopenmpi_dir
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" \
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3"
FFLAGS="$FFLAGS -O3 -Wl,-z,now -I%{_libdir}/gfortran/modules"
LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
@@ -575,28 +575,28 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
%endif
%if %{with cgns}
--with-cgns=1 \
- --with-cgns-include="" \
+ --with-cgns-include= \
--with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \
%endif
%if %{with hdf5}
--with-hdf5=1 \
- --with-hdf5-include="" \
+ --with-hdf5-include= \
--with-hdf5-lib="-L$MPI_LIB -lhdf5" \
%endif
%if %{with ptscotch}
--with-ptscotch=1 \
- --with-ptscotch-include="" \
+ --with-ptscotch-include= \
--with-ptscotch-lib="-L$MPI_LIB -lptscotch -lscotch -lptscotcherr -lscotcherr"
\
%endif
%if %{with mumps}
--with-mumps=1 \
- --with-mumps-include="" \
- --with-mumps-lib="-L$MPI_LIB -lmumps_common -ldmumps -lpord" \
+ --with-mumps-include=$MPI_INCLUDE \
+ --with-mumps-lib="-L$MPI_LIB -ldmumps" \
%endif
%if %{with sundials}
--with-sundials=1 \
- --with-sundials-include="" \
- --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel -lsundials_cvode" \
+ --with-sundials-include= \
+ --with-sundials-lib=-lsundials_nvecparallel \
%endif
%if %{with superludist}
--with-superlu_dist=1 \
@@ -615,7 +615,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
%endif
%if %{with fftw}
--with-fftw=1 \
- --with-fftw-include="" \
+ --with-fftw-include= \
--with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \
%endif
--with-pthread=1 \
@@ -637,7 +637,7 @@ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g
-Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,no
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" \
+ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS"
FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
@@ -686,12 +686,12 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
%endif
%if %{with cgns}
--with-cgns=1 \
- --with-cgns-include="" \
+ --with-cgns-include= \
--with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \
%endif
%if %{with hdf5}
--with-hdf5=1 \
- --with-hdf5-include="" \
+ --with-hdf5-include= \
--with-hdf5-lib="-L$MPI_LIB -lhdf5" \
%endif
%if %{with ptscotch}
@@ -701,13 +701,13 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
%endif
%if %{with mumps}
--with-mumps=1 \
- --with-mumps-include="" \
- --with-mumps-lib="-L$MPI_LIB -lmumps_common -ldmumps -lpord" \
+ --with-mumps-include=$MPI_INCLUDE \
+ --with-mumps-lib="-L$MPI_LIB -ldmumps" \
%endif
%if %{with sundials}
--with-sundials=1 \
- --with-sundials-include="" \
- --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel -lsundials_cvode" \
+ --with-sundials-include= \
+ --with-sundials-lib=-lsundials_nvecparallel \
%endif
%if %{with superludist}
--with-superlu_dist=1 \
@@ -726,7 +726,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
%endif
%if %{with fftw}
--with-fftw=1 \
- --with-fftw-include="" \
+ --with-fftw-include= \
--with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \
%endif
--with-pthread=1 \
@@ -1022,6 +1022,7 @@ make -C buildmpich_dir test
%changelog
* Wed Nov 08 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-3
- Rebuild for hypre-2.13.0
+- Disable sundials on MPI builds
* Sun Oct 29 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-2
- Define openblas arches
commit a78e6740a0d39fb7c0026eb2b327ab7e0f175b7d
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Nov 8 22:50:44 2017 +0100
Rebuild for hypre-2.13.0
diff --git a/petsc.spec b/petsc.spec
index a0d9e63..ac2d6ac 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -121,7 +121,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.8.0
-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
@@ -1020,6 +1020,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Wed Nov 08 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-3
+- Rebuild for hypre-2.13.0
+
* Sun Oct 29 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-2
- Define openblas arches
commit c81b773ea60df61f1d90389783805f31f8988977
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Oct 29 15:16:40 2017 +0100
Define openblas arches; rebuild for MUMPS-5.1.2
diff --git a/petsc.spec b/petsc.spec
index a96aa9c..a0d9e63 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -40,7 +40,18 @@
%bcond_without openmpi
%endif
+## BLAS
+# openblas available on these architectures.
+%if 0%{?fedora} && 0%{?fedora} > 26
+%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64
s390x}
+%else
+%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
+%endif
+%if 0%{?rhel}
+%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
+%endif
%bcond_without blas
+##
#
## PETSC looks incompatible with serial MUMPS
@@ -110,7 +121,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.8.0
-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
@@ -125,7 +136,7 @@ Patch1: %{name}-lib64.patch
Patch3: %{name}-disable_petscnagupgrade.patch
%if %{with superlu}
-BuildRequires: SuperLU-devel
+BuildRequires: SuperLU-devel >= 5.2.0
%endif
%if %{with superlumt}
BuildRequires: SuperLUMT-devel
@@ -140,11 +151,11 @@ BuildRequires: MUMPS-devel
BuildRequires: suitesparse-devel
%endif
%if %{with blas}
-%ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
+%ifarch %{openblas_arches}
+BuildRequires: openblas-devel, openblas-srpm-macros
+%else
BuildRequires: blas-devel
BuildRequires: lapack-devel
-%else
-BuildRequires: openblas-devel
%endif
%endif
BuildRequires: gcc-c++
@@ -183,12 +194,12 @@ PDF and HTML documentation files.
%if %{with arch64}
%package -n petsc64
Summary: Portable Extensible Toolkit for Scientific Computation (64bit INTEGER)
-%ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
-BuildRequires: blas64-devel
-BuildRequires: lapack64-devel
-%else
+%ifarch %{openblas_arches}
BuildRequires: openblas-serial64 >= 0.2.19-1
BuildRequires: openblas-devel >= 0.2.19-1
+%else
+BuildRequires: blas64-devel
+BuildRequires: lapack64-devel
%endif
%description -n petsc64
@@ -248,11 +259,11 @@ BuildRequires: fftw-openmpi-devel
BuildRequires: hypre-openmpi-devel
%endif
%if %{with blas}
-%ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
+%ifarch %{openblas_arches}
+BuildRequires: openblas-devel, openblas-srpm-macros
+%else
BuildRequires: blas-devel
BuildRequires: lapack-devel
-%else
-BuildRequires: openblas-devel
%endif
%endif
@@ -306,11 +317,11 @@ BuildRequires: fftw-devel
BuildRequires: fftw-mpich-devel
%endif
%if %{with blas}
-%ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
+%ifarch %{openblas_arches}
+BuildRequires: openblas-devel, openblas-srpm-macros
+%else
BuildRequires: blas-devel
BuildRequires: lapack-devel
-%else
-BuildRequires: openblas-devel
%endif
%endif
@@ -403,7 +414,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
--with-debugging=0 \
%endif
%if %{with blas}
-%ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
+%ifnarch %{openblas_arches}
--with-blas-lib=-lblas \
--with-lapack-lib=-llapack \
--known-64-bit-blas-indices=0 \
@@ -483,7 +494,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
--with-debugging=0 \
%endif
%if %{with blas64}
-%ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
+%ifnarch %{openblas_arches}
--with-blas-lib="-lblas64_" \
--with-lapack-lib="-llapack64_" \
--known-64-bit-blas-indices=1 \
@@ -543,7 +554,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
--with-debugging=0 \
%endif
%if %{with blas}
-%ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
+%ifnarch %{openblas_arches}
--with-blas-lib="-lblas" \
--with-lapack-lib="-llapack" \
--known-64-bit-blas-indices=0 \
@@ -654,7 +665,7 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS
-O3" FFLAGS="$FFLAGS -O3 -Wl
--with-debugging=0 \
%endif
%if %{with blas}
-%ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
+%ifnarch %{openblas_arches}
--with-blas-lib=-lblas \
--with-lapack-lib=-llapack \
--known-64-bit-blas-indices=0 \
@@ -1009,6 +1020,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sun Oct 29 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-2
+- Define openblas arches
+
* Tue Oct 03 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.8.0-1
- Update to 3.8.0
- with-mpiuni-fortran-binding option deprecated