rpms/petsc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove DATAFILESPATH options

Browse Source
This commit is contained in:
Antonio Trande 2021-09-12 18:16:20 +02:00
parent 411aa4b4f0
commit 8fee3e3501
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
petsc.spec
View File

@ -135,7 +135,6 @@
--with-mkl_cpardiso=0 \\\
--with-mkl_pardiso=0 \\\
--with-python=0 \\\
--DATAFILESPATH=$PWD/share/petsc/datafiles \\\
%if 0%{?fedora} \
--with-cxxlib-autodetect=0 \\\
%endif \
@ -201,7 +200,6 @@
--with-mkl_sparse_optimize=0 \\\
--with-mkl_cpardiso=0 \\\
--with-mkl_pardiso=0 \\\
--DATAFILESPATH=$PWD/share/petsc/datafiles \\\
%if %{with python} \
--with-python=1 \\\
--with-python-exec=%{__python3} \\\
@ -280,7 +278,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: %{releasever}.4
Release: 1%{?dist}
Release: 2%{?dist}
License: BSD
URL: https://petsc.org/
Source0: https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-with-docs-%{version}.tar.gz
@ -978,9 +976,9 @@ export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes --track-origins=
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${MPI_FORTRAN_MOD_DIR}"
xvfb-run -a make -j1 all test -C buildopenmpi_dir V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/buildopenmpi_dir/lib/petsc/bin/petscmpiexec -valgrind'
xvfb-run -a make MAKE_NP=1 all test -C buildopenmpi_dir V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/buildopenmpi_dir/lib/petsc/bin/petscmpiexec -valgrind'
%else
xvfb-run -a make -j1 all test -C buildopenmpi_dir V=1
xvfb-run -a make MAKE_NP=1 all test -C buildopenmpi_dir V=1
%endif
%endif
@ -1017,9 +1015,9 @@ export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes --track-origins=
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${MPI_FORTRAN_MOD_DIR}"
xvfb-run -a make -j1 all test -C buildmpich_dir V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/buildmpich_dir/lib/petsc/bin/petscmpiexec -valgrind'
xvfb-run -a make MAKE_NP=1 all test -C buildmpich_dir V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/buildmpich_dir/lib/petsc/bin/petscmpiexec -valgrind'
%else
xvfb-run -a make -j1 all test -C buildmpich_dir V=1
xvfb-run -a make MAKE_NP=1 all test -C buildmpich_dir V=1
%endif
%endif
@ -1047,15 +1045,14 @@ export LD_LIBRARY_PATH=%{_libdir}:%{_builddir}/%{name}-%{version}/%{name}-%{vers
export PETSC_DIR=%{_builddir}/%{name}-%{version}/%{name}-%{version}
export PETSC_ARCH=%{_arch}
export wPETSC_DIR=./
%if %{with debug}
export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes --track-origins=yes"
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"
xvfb-run -a make -j1 all test -C %{name}-%{version} V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/lib/petsc/bin/petscmpiexec -n `getconf _NPROCESSORS_ONLN` -valgrind'
xvfb-run -a make MAKE_NP=1 all test -C %{name}-%{version} V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/lib/petsc/bin/petscmpiexec -n `%{_bindir}/getconf _NPROCESSORS_ONLN` -valgrind'
%else
xvfb-run -a make -j1 all test -C %{name}-%{version} V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/lib/petsc/bin/petscmpiexec -n `getconf _NPROCESSORS_ONLN`'
xvfb-run -a make MAKE_NP=1 all test -C %{name}-%{version} V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/lib/petsc/bin/petscmpiexec -n `%{_bindir}/getconf _NPROCESSORS_ONLN`'
%endif
%if %{with arch64}
@ -1063,7 +1060,6 @@ export LD_LIBRARY_PATH=%{_libdir}:%{_builddir}/%{name}-%{version}/build64/%{_arc
export PETSC_DIR=%{_builddir}/%{name}-%{version}/build64
export PETSC_ARCH=%{_arch}
export wPETSC_DIR=./
## 'make test' needs to link against -lpetsc
## Crude fix:
ln -s %{_builddir}/%{name}-%{version}/build64/%{_arch}/lib/libpetsc64.so %{_builddir}/%{name}-%{version}/build64/%{_arch}/lib/libpetsc.so
@ -1073,9 +1069,9 @@ export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes --track-origins=
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"
xvfb-run -a make -j1 all test -C build64 V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/build64/lib/petsc/bin/petscmpiexec -n `getconf _NPROCESSORS_ONLN` -valgrind'
xvfb-run -a make MAKE_NP=1 all test -C build64 V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/build64/lib/petsc/bin/petscmpiexec -n `%{_bindir}/getconf _NPROCESSORS_ONLN` -valgrind'
%else
xvfb-run -a make -j1all test -C build64 V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/build64/lib/petsc/bin/petscmpiexec -n `getconf _NPROCESSORS_ONLN`'
xvfb-run -a make MAKE_NP=1 all test -C build64 V=1 MPIEXEC='%{_builddir}/%{name}-%{version}/build64/lib/petsc/bin/petscmpiexec -n `%{_bindir}/getconf _NPROCESSORS_ONLN`'
%endif
%endif
%endif
@ -1167,6 +1163,10 @@ xvfb-run -a make -j1all test -C build64 V=1 MPIEXEC='%{_builddir}/%{name}-%{vers
%endif
%changelog
* Sun Sep 12 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.15.4-2
- Set MAKE_NP option for testing
- Remove DATAFILESPATH options
* Sat Sep 11 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.15.4-1
- Release 3.15.4