diff --git a/petsc.spec b/petsc.spec index e1c6428..fb2bcad 100644 --- a/petsc.spec +++ b/petsc.spec @@ -36,7 +36,9 @@ %if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64 %bcond_without arch64 +%bcond_without metis64 %else +%bcond_without metis %bcond_with arch64 %endif @@ -90,13 +92,6 @@ %bcond_with tetgen # -## Metis -%bcond_without metis -%if 0%{?fedora} || 0%{?rhel} < 8 -%bcond_without metis64 -%endif -# - # 'scalapack' is required by 'MUMPS' %if %{with openmpi} %bcond_without mpi @@ -587,13 +582,16 @@ pushd %{name}-%{version} rm $(grep -rl '/\* Generated by Cython') popd +pushd %{name}-%{version} +%if %{with metis64} +%patch4 -p1 -b .metis64 +%endif +popd + %if %{with arch64} cp -a %{name}-%{version} build64 pushd build64 %patch1 -p0 -%if %{with metis64} -%patch4 -p1 -b .metis64 -%endif popd %endif @@ -632,9 +630,7 @@ pushd %{name}-%{version} --with-openblas=1 --with-openblas-lib=-l%{blaslib}%{blasvar} --with-openblas-include=%{_includedir}/%{blaslib} \ %endif %endif -%if %{with metis} --with-metis=1 \ -%endif %if %{with tetgen} --with-tetgen=1 \ --with-tetgen-lib=-ltetgen \ @@ -662,9 +658,7 @@ pushd build64 %configure --with-cc=gcc --with-cxx=g++ --with-fc=gfortran \ %{petsc_build_options} \ --with-64-bit-indices=1 \ -%if %{with metis64} --with-metis=1 \ -%endif %if %{with blas64} %if 0%{?fedora} || 0%{?rhel} >= 9 --with-blaslapack=1 --with-blaslapack-lib=-l%{blaslib}%{blasvar}64 --with-blaslapack-include=%{_includedir}/%{blaslib} \ @@ -696,9 +690,7 @@ export FC=mpifort --FC_LINKER_FLAGS="$LDFLAGS -lgfortran -lmpi_mpifh" \ --LIBS=" -lmpi -lmpi_mpifh" \ %{petsc_mpibuild_options} \ -%if %{with metis} --with-metis=1 \ -%endif %if %{with index64} --with-64-bit-indices=1 \ %endif @@ -739,9 +731,7 @@ export FC=mpifort --FC_LINKER_FLAGS="$LDFLAGS -lgfortran -lfmpich -lmpichf90" \ --LIBS=" -lmpich -lfmpich -lmpichf90" \ %{petsc_mpibuild_options} \ -%if %{with metis} --with-metis=1 \ -%endif %if %{with index64} --with-64-bit-indices=1 \ %endif @@ -1177,6 +1167,7 @@ xvfb-run -a make MAKE_NP=$RPM_BUILD_NCPUS all test -C build64 V=1 MPIEXEC='%{_bu %changelog * Thu Feb 23 2023 Antonio Trande - 3.17.4-12 - Enable PETSC_INDEX_SIZE_64 in 64-bit architectures +- Use always metis64 in 64-bit architectures * Thu Feb 23 2023 Antonio Trande - 3.17.4-11 - Disable LTO flags