Update to 3.8.3

This commit is contained in:
sagitter 2018-01-28 22:38:08 +01:00
parent 34688b05c0
commit 2c137ab678
3 changed files with 34 additions and 23 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/petsc-3.7.7.tar.gz /petsc-3.7.7.tar.gz
/petsc-3.8.0.tar.gz /petsc-3.8.0.tar.gz
/petsc-3.8.1.tar.gz /petsc-3.8.1.tar.gz
/petsc-3.8.3.tar.gz

View File

@ -106,7 +106,7 @@
%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64 %if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64
%if 0%{?el6} %if 0%{?el6}
%bcond_without arch64 %bcond_with arch64
%else %else
%bcond_without arch64 %bcond_without arch64
%endif %endif
@ -125,8 +125,8 @@
Name: petsc Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation Summary: Portable Extensible Toolkit for Scientific Computation
Version: %{releasever}.1 Version: %{releasever}.3
Release: 3%{?dist} Release: 1%{?dist}
License: BSD License: BSD
URL: https://www.mcs.anl.gov/petsc URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@ -171,6 +171,7 @@ BuildRequires: pcre-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
BuildRequires: tcsh BuildRequires: tcsh
Requires: gcc-gfortran%{?_isa}
%description %description
PETSc, pronounced PET-see (the S is silent), is a suite of data structures PETSc, pronounced PET-see (the S is silent), is a suite of data structures
@ -180,12 +181,7 @@ modeled by partial differential equations.
%package devel %package devel
Summary: Portable Extensible Toolkit for Scientific Computation (developer files) Summary: Portable Extensible Toolkit for Scientific Computation (developer files)
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: gcc-gfortran%{?_isa}
%if 0%{?fedora} < 26
Requires: pkgconfig
%else
Requires: pkgconf Requires: pkgconf
%endif
%description devel %description devel
Portable Extensible Toolkit for Scientific Computation (developer files). Portable Extensible Toolkit for Scientific Computation (developer files).
@ -206,6 +202,7 @@ BuildRequires: openblas-devel >= 0.2.19-1
BuildRequires: blas64-devel BuildRequires: blas64-devel
BuildRequires: lapack64-devel BuildRequires: lapack64-devel
%endif %endif
Requires: gcc-gfortran%{?_isa}
%description -n petsc64 %description -n petsc64
PETSc, pronounced PET-see (the S is silent), is a suite of data structures PETSc, pronounced PET-see (the S is silent), is a suite of data structures
@ -215,11 +212,7 @@ modeled by partial differential equations (64bit INTEGER).
%package -n petsc64-devel %package -n petsc64-devel
Requires: %{name}64%{?_isa} = %{version}-%{release} Requires: %{name}64%{?_isa} = %{version}-%{release}
Requires: gcc-gfortran%{?_isa} Requires: gcc-gfortran%{?_isa}
%if 0%{?fedora} < 26
Requires: pkgconfig
%else
Requires: pkgconf Requires: pkgconf
%endif
Summary: Portable Extensible Toolkit for Scientific Computation (64bit INTEGER) Summary: Portable Extensible Toolkit for Scientific Computation (64bit INTEGER)
%description -n petsc64-devel %description -n petsc64-devel
@ -271,6 +264,7 @@ BuildRequires: blas-devel
BuildRequires: lapack-devel BuildRequires: lapack-devel
%endif %endif
%endif %endif
Requires: gcc-gfortran%{?_isa}
%description openmpi %description openmpi
PETSc, pronounced PET-see (the S is silent), is a suite of data structures PETSc, pronounced PET-see (the S is silent), is a suite of data structures
@ -329,6 +323,7 @@ BuildRequires: blas-devel
BuildRequires: lapack-devel BuildRequires: lapack-devel
%endif %endif
%endif %endif
Requires: gcc-gfortran%{?_isa}
%if 0%{?el6} %if 0%{?el6}
Requires: mpich%{?_isa} Requires: mpich%{?_isa}
@ -393,6 +388,8 @@ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,no
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" \ 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" \ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif %endif
--CC_LINKER_FLAGS="$LDFLAGS -Wl,-z,now -fPIC -lgfortran" \
--FC_LINKER_FLAGS="$LDFLAGS -Wl,-z,now -fPIC -lgfortran" \
--with-default-arch=0 --with-make=1 \ --with-default-arch=0 --with-make=1 \
--with-single-library=1 \ --with-single-library=1 \
--with-precision=double \ --with-precision=double \
@ -477,6 +474,8 @@ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,no
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" \ 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" \ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif %endif
--CC_LINKER_FLAGS="$LDFLAGS -Wl,-z,now -fPIC -lgfortran" \
--FC_LINKER_FLAGS="$LDFLAGS -Wl,-z,now -fPIC -lgfortran" \
--with-default-arch=0 --with-make=1 \ --with-default-arch=0 --with-make=1 \
--with-single-library=1 \ --with-single-library=1 \
--with-precision=double \ --with-precision=double \
@ -538,6 +537,8 @@ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,no
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" \ 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" \ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif %endif
--CC_LINKER_FLAGS="$LDFLAGS -Wl,-z,now -fPIC -lgfortran -L$MPI_LIB -lmpi_mpifh" \
--FC_LINKER_FLAGS=" -lgfortran" \
--with-default-arch=0 --with-make=1 \ --with-default-arch=0 --with-make=1 \
--with-single-library=1 \ --with-single-library=1 \
--with-precision=double \ --with-precision=double \
@ -547,9 +548,9 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
--with-64-bit-indices=0 \ --with-64-bit-indices=0 \
--with-fortran-interfaces=1 \ --with-fortran-interfaces=1 \
--with-windows-graphics=0 \ --with-windows-graphics=0 \
--CC=$MPI_BIN/mpicc \ --with-cc=mpicc \
--CXX=$MPI_BIN/mpicxx \ --with-cxx=mpicxx \
--FC=$MPI_BIN/mpif77 \ --with-fc=mpif77 \
--with-shared-ld=ld \ --with-shared-ld=ld \
--with-pic=1 \ --with-pic=1 \
--with-clib-autodetect=0 \ --with-clib-autodetect=0 \
@ -580,8 +581,6 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
%if %{with mpi} %if %{with mpi}
--with-mpi=1 \ --with-mpi=1 \
--with-mpi-compilers=$MPI_BIN/mpicc \
--with-mpiexec=$MPI_BIN/mpiexec \
%endif %endif
%if %{with cgns} %if %{with cgns}
--with-cgns=1 \ --with-cgns=1 \
@ -630,6 +629,8 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
--with-pthread=1 \ --with-pthread=1 \
--with-valgrind=1 --with-valgrind=1
#cat config.log
#exit 1
RPM_BUILD_NCPUS="`%{_bindir}/getconf _NPROCESSORS_ONLN`" RPM_BUILD_NCPUS="`%{_bindir}/getconf _NPROCESSORS_ONLN`"
make \ make \
@ -649,6 +650,8 @@ CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,no
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \ 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 -I%{_libdir}/gfortran/modules" \ COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" \
%endif %endif
--CC_LINKER_FLAGS="$LDFLAGS -Wl,-z,now -fPIC -lgfortran -L$MPI_LIB -lmpichf90" \
--FC_LINKER_FLAGS=" -lgfortran" \
--with-default-arch=0 --with-make=1 \ --with-default-arch=0 --with-make=1 \
--with-single-library=1 \ --with-single-library=1 \
--with-precision=double \ --with-precision=double \
@ -658,9 +661,9 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
--with-64-bit-indices=0 \ --with-64-bit-indices=0 \
--with-fortran-interfaces=1 \ --with-fortran-interfaces=1 \
--with-windows-graphics=0 \ --with-windows-graphics=0 \
--CC=$MPI_BIN/mpicc \ --with-cc=mpicc \
--CXX=$MPI_BIN/mpicxx \ --with-cxx=mpicxx \
--FC=$MPI_BIN/mpif77 \ --with-fc=mpif77 \
--with-shared-ld=ld \ --with-shared-ld=ld \
--with-pic=1 \ --with-pic=1 \
--with-clib-autodetect=0 \ --with-clib-autodetect=0 \
@ -691,8 +694,6 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
%if %{with mpi} %if %{with mpi}
--with-mpi=1 \ --with-mpi=1 \
--with-mpi-compilers=$MPI_BIN/mpicc \
--with-mpiexec=$MPI_BIN/mpiexec \
%endif %endif
%if %{with cgns} %if %{with cgns}
--with-cgns=1 \ --with-cgns=1 \
@ -741,6 +742,8 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
%endif %endif
--with-pthread=1 \ --with-pthread=1 \
--with-valgrind=1 --with-valgrind=1
#cat config.log
#exit 1
RPM_BUILD_NCPUS="`%{_bindir}/getconf _NPROCESSORS_ONLN`" RPM_BUILD_NCPUS="`%{_bindir}/getconf _NPROCESSORS_ONLN`"
make \ make \
@ -1050,6 +1053,13 @@ make -C buildmpich_dir test
%endif %endif
%changelog %changelog
* Sun Jan 28 2018 Antonio Trande <sagitter@fedoraproject.org> - 3.8.3-1
- Update to 3.8.3
- Rebuild for sundials-3.1.0
* Thu Dec 14 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.1-4
- Not build 64-bit integer libraries on epel6
* Sun Dec 03 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.1-3 * Sun Dec 03 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.1-3
- Build 64-bit integer libraries on epel7 - Build 64-bit integer libraries on epel7

View File

@ -1 +1 @@
SHA512 (petsc-3.8.1.tar.gz) = 8480265e80574434252961b788602e2667d1aede48d5c80b34719895e644767bc5bc2e09deaba5ca825f7871df801e2efbb7ec1b114183aeb9376b42b77ba74e SHA512 (petsc-3.8.3.tar.gz) = 32980ea71c09a59a15e897614b66a0e900ee0d7d65b30343745c452a4bcc8384536f48e846b72250a320aba0251eae0de923ca593185dd1e2ceb4580037d6d5b