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=b4a5b382efeb175....
Change: +%ifarch s390x
Thanks.
Full change: ============
commit b4a5b382efeb17507e11386630b8e67f49c1dbd8 Author: sagitter sagitter@fedoraproject.org Date: Sat Mar 31 20:18:33 2018 +0200
Update to 3.8.4
diff --git a/.gitignore b/.gitignore index 3dbc118..4b18f8c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /petsc-3.8.0.tar.gz /petsc-3.8.1.tar.gz /petsc-3.8.3.tar.gz +/petsc-3.8.4.tar.gz diff --git a/petsc-3.8.4_hypre_2.14.0.patch b/petsc-3.8.4_hypre_2.14.0.patch new file mode 100644 index 0000000..8cfca26 --- /dev/null +++ b/petsc-3.8.4_hypre_2.14.0.patch @@ -0,0 +1,25 @@ +diff --git a/config/BuildSystem/config/packages/hypre.py b/config/BuildSystem/config/packages/hypre.py +index 1249b39374..620e51602a 100644 +--- a/config/BuildSystem/config/packages/hypre.py ++++ b/config/BuildSystem/config/packages/hypre.py +@@ -4,7 +4,7 @@ import os + class Configure(config.package.GNUPackage): + def __init__(self, framework): + config.package.GNUPackage.__init__(self, framework) +- self.gitcommit = 'v2.12.0' ++ self.gitcommit = 'v2.14.0' + self.download = ['git://https://github.com/LLNL/hypre%27,%27https://github.com/LLNL/hypre/archive/%2...'] + self.functions = ['HYPRE_IJMatrixCreate'] + self.includes = ['HYPRE.h'] +diff --git a/src/mat/impls/hypre/mhypre.c b/src/mat/impls/hypre/mhypre.c +index 8a51581a09..65595f2af4 100644 +--- a/src/mat/impls/hypre/mhypre.c ++++ b/src/mat/impls/hypre/mhypre.c +@@ -1450,6 +1450,6 @@ PETSC_EXTERN PetscErrorCode MatCreate_HYPRE(Mat B) + static PetscErrorCode hypre_array_destroy(void *ptr) + { + PetscFunctionBegin; +- hypre_TFree(ptr); ++ hypre_TFree(ptr,HYPRE_MEMORY_HOST); + PetscFunctionReturn(0); + } diff --git a/petsc.spec b/petsc.spec index 7ec7650..0594dea 100644 --- a/petsc.spec +++ b/petsc.spec @@ -24,14 +24,19 @@ %bcond_without mpich %endif %endif -%if 0%{?fedora} +%if 0%{?fedora} < 28 ## Exclude MPI builds on s390x %ifarch s390x %bcond_with mpich %bcond_with openmpi -%else +%endif +%endif + +%if 0%{?fedora} > 28 +## Exclude MPI builds on s390x +%ifarch s390x %bcond_without mpich -%bcond_without openmpi +%bcond_with openmpi %endif %endif
@@ -85,7 +90,7 @@ # 'scalapack' is required by 'mumps' %if %{with openmpi} %bcond_without mpi -# PETSC is incompatible with Sundials 3.* +# PETSC-3.8.* is incompatible with Sundials 3.* %bcond_with sundials %bcond_without scalapack %bcond_without mumps @@ -95,7 +100,7 @@
%if %{with mpich} %bcond_without mpi -# PETSC is incompatible with Sundials 3.* +# PETSC-3.8.* is incompatible with Sundials 3.* %bcond_with sundials %bcond_without scalapack %bcond_without mumps @@ -124,8 +129,8 @@
Name: petsc Summary: Portable Extensible Toolkit for Scientific Computation -Version: %{releasever}.3 -Release: 4%{?dist} +Version: %{releasever}.4 +Release: 1%{?dist} License: BSD URL: https://www.mcs.anl.gov/petsc Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%%7Bversion%7D.tar.... @@ -139,6 +144,9 @@ Patch1: %{name}-lib64.patch # Disable checkopts and petscnagupgrade.py Patch3: %{name}-disable_petscnagupgrade.patch
+# Patch for using Hypre-2.14.0 +Patch4: %{name}-%{version}_hypre_2.14.0.patch + %if %{with superlu} BuildRequires: SuperLU-devel >= 5.2.0 %endif @@ -361,6 +369,10 @@ Portable Extensible Toolkit for Scientific Computation (developer files).
pushd %{name}-%{version} %patch3 -p0 + +%if 0%{?fedora} > 28 +%patch4 -p1 +%endif popd
%if %{with arch64} @@ -1060,6 +1072,11 @@ make -C buildmpich_dir test %endif
%changelog +* Fri Mar 30 2018 Antonio Trande sagitter@fedoraproject.org - 3.8.4-1 +- Update to 3.8.4 +- Exclude MPI builds on s390 archirectures if fedora < 28 only +- Patched for using Hypre-2.14.0 + * Tue Feb 06 2018 Antonio Trande sagitter@fedoraproject.org - 3.8.3-4 - Fix pkgconfig request on rhel
diff --git a/sources b/sources index 216c690..58c9bab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (petsc-3.8.3.tar.gz) = 32980ea71c09a59a15e897614b66a0e900ee0d7d65b30343745c452a4bcc8384536f48e846b72250a320aba0251eae0de923ca593185dd1e2ceb4580037d6d5b +SHA512 (petsc-3.8.4.tar.gz) = c186e143619c12d2175d01046c26221c462091706af0b68515ba1d2c93f97738ec375df7aa0551c5a14c240e80ca744f9d796778f4937a8c8021d64abe1f3b2c
arch-excludes@lists.fedoraproject.org