The package rpms/hypre.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/hypre.git/commit/?id=74d645e5da6fbf9....
Change: -%ifarch %ix86
Thanks.
Full change: ============
commit 74d645e5da6fbf91875b9e1f358525bdb0706537 Author: Dave Love loveshack@fedoraproject.org Date: Fri Nov 23 11:28:22 2018 +0000
- New version, removing hypre_PFMGSetupInterpOp_CC0, hypre_finalize, hypre_init, which appear actually to be internal, so soname unchanged - Avoid tests
diff --git a/.gitignore b/.gitignore index 1ac86ad..1ab300b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /hypre-2.11.2.tar.gz /hypre-2.13.0.tar.gz /hypre-2.14.0.tar.gz +/hypre-2.15.1.tar.gz diff --git a/hypre-soname.patch b/hypre-soname.patch index 5ac35c3..3bbf609 100644 --- a/hypre-soname.patch +++ b/hypre-soname.patch @@ -9,14 +9,14 @@ .SUFFIXES: .SUFFIXES: .o .f .c .C .cxx .cc .cu
---- hypre-2.11.1/src/lib/Makefile~ 2016-06-09 15:56:18.000000000 +0100 -+++ hypre-2.11.1/src/lib/Makefile 2016-07-04 18:50:20.073119136 +0100 -@@ -59,7 +59,7 @@ +--- hypre-2.15.1/src/lib/Makefile~ 2018-10-19 16:21:31.000000000 +0100 ++++ hypre-2.15.1/src/lib/Makefile 2018-11-21 23:42:24.460549805 +0000 +@@ -57,7 +57,7 @@ $(BLASFILES)\ $(LAPACKFILES)
--SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}.so -+SONAME = libHYPRE.so.$(SOVER) +-SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} ++SONAME = libHYPRE.so.${SOVER} SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS}
diff --git a/hypre.spec b/hypre.spec index 8c37dbf..63451ca 100644 --- a/hypre.spec +++ b/hypre.spec @@ -16,6 +16,8 @@ %bcond_without mpich %endif
+%bcond_with check + %{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} %ifarch %{openblas_arches} %global use_openblas 1 @@ -24,8 +26,8 @@ %endif
Name: hypre -Version: 2.14.0 -Release: 4%{?dist} +Version: 2.15.1 +Release: 1%{?dist} Summary: High performance matrix preconditioners # FEI_mv/ml/src/Include/ml_vampir.h has a GPL notice, but it doesn't # look copyright-significant. @@ -169,7 +171,7 @@ pushd src --with-lapack --enable-shared --with-superlu --with-superlu-include=%_includedir/SuperLU \ LDFLAGS="-lsuperlu -fopenmp -lm $LDFLAGS -Wl,--as-needed" \ CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_ -fopenmp" -make %{?_smp_mflags} +%make_build popd
%global do_mpi_build \ @@ -180,7 +182,7 @@ popd --enable-shared --with-dsuperlu --with-dsuperlu-include=$MPI_INCLUDE/superlu_dist \\ LDFLAGS=" -lsuperlu_dist -lsuperlu -lptscotch -Wl,--as-needed $LDFLAGS" \\ CFLAGS="$CFLAGS -O3 -Dhypre_dgesvd=dgesvd_" \ - make %{?_smp_mflags} + %make_build
%if %{with openmpi} pushd openmpi @@ -200,16 +202,15 @@ popd
%check -# Fixme: It's currently hanging on rawhide i686. Disabling to get it -# built for dependencies, pending an opportunity to debug it when -# miirors have caught up. -%ifarch %ix86 +# Currently seeing inconsistent hangs on koji (as for superlu_dist). +# Assume it doesn't deadlock in realistic situations. +%if %{with check} %if %{with openmpi} export LD_LIBRARY_PATH=$(pwd)/openmpi/hypre/lib export OMPI_MCA_orte_allocation_required=0 %_openmpi_load pushd openmpi/test -make %{?_smp_mflags} +%make_build # A random selection to check, rather than all possibilities. (The # relevant binaries aren't built for all the TEST_...s.) ./runtest.sh TEST_ij/*sh @@ -239,16 +240,9 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \ %_mpich_unload %endif
-%if 0%{?ldconfig_scriptlets} %ldconfig_scriptlets -%else -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig -%endif
-%{!?_licensedir:%global license %doc} - %files %doc CHANGELOG %license COPYING.LESSER COPYRIGHT src/docs/copyright.txt @@ -286,6 +280,11 @@ make -C mpich install HYPRE_INSTALL_DIR=%{buildroot}$MPI_HOME \ %doc docs/*.pdf
%changelog +* Wed Nov 21 2018 Dave Love loveshack@fedoraproject.org - 2.15.1-1 +- New version, removing hypre_PFMGSetupInterpOp_CC0, hypre_finalize, + hypre_init, which appear actually to be internal, so soname unchanged +- Avoid tests + * Thu Jul 19 2018 Sandro Mani manisandro@gmail.com - 2.14.0-4 - Rebuild (scotch)
diff --git a/sources b/sources index 6abd793..4513da9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hypre-2.14.0.tar.gz) = c7b59fb7ab1cc906e339fcc00603898e44234a65aa74600f740bc825aa94aa66ff0cbd4bd4b7f339c0d28ff5bd9494f15b57f2017a22348fee14b4e8333f1e6c +SHA512 (hypre-2.15.1.tar.gz) = 5be677727b815b2eb0cd711b65ff6b4ef798f42023ec2831e66bfbba7de0288208c67257734641b40f884868e8b0db97bb12d4d3ea27e97e36041eacc7ac9fa2