commit 2ad3b2661f87704090aaefb9bcf9c9264b59534d
parent 4df4a1efe749f56b84f6e08107c7ac8dd43c827c
Author: Lucas Heitzmann Gabrielli <heitzmann@gmail.com>
Date: Sat, 17 Oct 2020 15:42:41 -0300
Update to release branch by default
Diffstat:
| M | .SRCINFO | | | 8 | ++++---- |
| M | PKGBUILD | | | 250 | +++++++++++++++++++++++++++++++++---------------------------------------------- |
2 files changed, 108 insertions(+), 150 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = petsc-git
pkgdesc = Portable, extensible toolkit for scientific computation (external downloads enabled)
- pkgver = 20200520
+ pkgver = 20201016
pkgrel = 1
- url = https://www.mcs.anl.gov/petsc/
+ url = https://gitlab.com/petsc/petsc
install = petsc.install
arch = i686
arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = petsc-git
makedepends = gcc-fortran
makedepends = cmake
makedepends = sowing
- makedepends = python2
+ makedepends = python
depends = openmpi
depends = lapack
depends = fftw
@@ -26,7 +26,7 @@ pkgbase = petsc-git
optdepends = python: Tools, examples, tutorials
provides = petsc
conflicts = petsc
- source = petsc::git+https://gitlab.com/petsc/petsc.git#branch=maint
+ source = petsc::git+https://gitlab.com/petsc/petsc.git#branch=release
sha256sums = SKIP
pkgname = petsc-git
diff --git a/PKGBUILD b/PKGBUILD
@@ -1,17 +1,17 @@
# Maintainer: Lucas H. Gabrielli <heitzmann@gmail.com>
pkgname=petsc-git
-pkgver=20200520
+pkgver=20201016
pkgrel=1
_config=linux-c-opt
pkgdesc="Portable, extensible toolkit for scientific computation (external downloads enabled)"
provides=(petsc)
conflicts=(petsc)
arch=('i686' 'x86_64')
-url="https://www.mcs.anl.gov/petsc/"
+url="https://gitlab.com/petsc/petsc"
license=('BSD')
depends=('openmpi' 'lapack' 'fftw' 'hdf5' 'suitesparse')
-makedepends=('gcc' 'gcc-fortran' 'cmake' 'sowing' 'python2')
+makedepends=('gcc' 'gcc-fortran' 'cmake' 'sowing' 'python')
optdepends=("opencl: GPU computing"
"hwloc: hardware locality"
"cgns: CFD data support"
@@ -20,26 +20,11 @@ optdepends=("opencl: GPU computing"
"libx11: GUI tools"
"python: Tools, examples, tutorials")
install=petsc.install
-source=(petsc::git+https://gitlab.com/petsc/petsc.git#branch=maint)
+source=(petsc::git+https://gitlab.com/petsc/petsc.git#branch=release)
sha256sums=('SKIP')
_petsc_arch="arch-${_config}"
-#####################################################################
-# From UPC: Building And Using Static And Shared "C" Libraries.html #
-# #+begin_QUOTE #
-# we need that all jump calls ("goto", in assembly speak) #
-# and subroutine calls will use relative addresses, and not #
-# absolute addresses. Thus, we need to use ... ~-fPIC~ or #
-# ~-fpic~ #
-# #+end_QUOTE #
-#####################################################################
-###############################################################################
-# From makepkg.conf #
-# -march (or -mcpu) builds exclusively for an architecture #
-# -mtune optimizes for an architecture, but builds for whole processor family #
-###############################################################################
-# -O3 optimises
generic_flags="-fPIC -fopenmp -O3 -march=x86-64 -mtune=generic"
# generic_flags="-fPIC -fopenmp -O3 -march=amdfam10 -mtune=generic"
@@ -56,149 +41,122 @@ export F77FLAGS="$generic_flags"
pkgver() {
- cd petsc
- git log --format="%cd" --date=short -1 | sed 's/-//g'
+ cd petsc
+ git log --format="%cd" --date=short -1 | sed 's/-//g'
}
prepare() {
- # force using python2
- MATCH='\(/usr/bin/env\|/usr/bin/\)python[[:digit:].]*'
- while IFS= read file; do
- sed -i "s#$MATCH#\\1python2#" "$file"
- done < <( find ${srcdir} -name "*" -type f -exec grep -le "$MATCH" \{\} + )
-
- cd "${srcdir}/petsc"
- sed -i 's-\(self.publicInstall[^=]*=[[:space:]]\)[^#]*-\10 -g' config/BuildSystem/config/package.py
- sed -i "s/\(raise RuntimeError('--download-openblas libraries cannot be used')\)/#\1/" config/BuildSystem/config/packages/BlasLapack.py
+ cd "${srcdir}/petsc"
+ sed -i 's-\(self.publicInstall[^=]*=[[:space:]]\)[^#]*-\10 -g' config/BuildSystem/config/package.py
}
build() {
- cd petsc
-
- # Run python2 ./configure --help for the meaning of this
- declare -a CONFOPTS
- CONFOPTS=(
- --COPTFLAGS="$COPTFLAGS"
- --CXXOPTFLAGS="$CXXOPTFLAGS"
- --CPPFLAGS="$CPPFLAGS"
- --CFLAGS="$CFLAGS"
- --CXXFLAGS="$CXXFLAGS"
- --FFLAGS="$FFLAGS"
- --FCFLAGS="$FCFLAGS"
- --F90FLAGS="$F90FLAGS"
- --F77FLAGS="$F77FLAGS"
-
- --with-cxx-dialect=C++11
- --with-mpi=1
- --with-pic=1
- --with-shared-libraries=1
- --with-zlib=1
-
- --with-fftw=1
- --with-hdf5=1
- --with-suitesparse=1
-
- --with-scalar-type=complex
-
- --download-amd=1
- --download-eigen=1
- --download-hypre=1
- --download-metis=1
- --download-mumps=1
- --download-parmetis=1
- #--download-party=1 # not working
- --download-ptscotch=1
- --download-scalapack=1
- #--download-suitesparse=1 # not working
- #--download-sundials=1 # incompatible with complex
- --download-superlu=1
- --download-superlu_dist=1
- )
-
- CONFOPTS=( "${CONFOPTS[@]}" )
-
- # Add OpenCL support
- OPENCL_DIR="/usr/include/CL/"
- if [ -f "${OPENCL_DIR}/cl.h" ]; then
- CONFOPTS="${CONFOPTS} --with-opencl=1"
- fi
-
- # Add hwloc support
- if [ -f "/usr/lib/libhwloc.so" ]; then
- CONFOPTS="${CONFOPTS} --with-hwloc=1 --with-hwloc-pkg-config=/usr/lib/pkgconfig/"
- fi
-
- # Add CGNS support
- if [ -f "/usr/lib/libcgns.so" ]; then
- CONFOPTS="${CONFOPTS} --with-cgns=1"
- fi
-
- # Add PNG support
- if [ -f "/usr/lib/libpng.so" ]; then
- CONFOPTS="${CONFOPTS} --with-png=1 --with-png-pkg-config=/usr/lib/pkgconfig/"
- fi
-
- # Add YAML support
- if [ -f "/usr/lib/libyaml.so" ]; then
- CONFOPTS="${CONFOPTS} --with-yaml=1 --with-yaml-pkg-config=/usr/lib/pkgconfig/"
- fi
-
- # if --with-debugging=1 is set then PETSC_ARCH is automatically set to
- # "linux-c-debug" for some things, so _config should be changed to "linux-c-debug"
- #CONFOPTS="${CONFOPTS} --with-debugging=1"
-
- dirpkg=${srcdir}/petsc/${_petsc_arch}/externalpackages/
-
- export PETSC_DIR="${srcdir}/petsc"
- export PETSC_ARCH="${_petsc_arch}"
-
- python2 ./configure LDFLAGS="$LDFLAGS" \
- --prefix=/usr/petsc/${_config} \
- --MAKEFLAGS="$MAKEFLAGS" \
- $(for (( i=1; i<=${#CONFOPTS[@]}; i++)); do
- echo "${CONFOPTS[$i]}";
- done)
- make clean
- make all
+ cd petsc
+
+ declare -a CONFOPTS
+ CONFOPTS=(
+ --COPTFLAGS="$COPTFLAGS"
+ --CXXOPTFLAGS="$CXXOPTFLAGS"
+ --CPPFLAGS="$CPPFLAGS"
+ --CFLAGS="$CFLAGS"
+ --CXXFLAGS="$CXXFLAGS"
+ --FFLAGS="$FFLAGS"
+ --FCFLAGS="$FCFLAGS"
+ --F90FLAGS="$F90FLAGS"
+ --F77FLAGS="$F77FLAGS"
+
+ --with-cxx-dialect=C++11
+ --with-mpi=1
+ --with-pic=1
+ --with-shared-libraries=1
+ --with-zlib=1
+
+ --with-fftw=1
+ --with-hdf5=1
+ --with-suitesparse=1
+
+ --with-scalar-type=complex
+
+ --download-amd=1
+ --download-eigen=1
+ --download-hypre=1
+ --download-metis=1
+ --download-mumps=1
+ --download-parmetis=1
+ --download-ptscotch=1
+ --download-scalapack=1
+ --download-superlu=1
+ --download-superlu_dist=1
+ )
+
+ CONFOPTS=( "${CONFOPTS[@]}" )
+
+ # Add OpenCL support
+ OPENCL_DIR="/usr/include/CL/"
+ if [ -f "${OPENCL_DIR}/cl.h" ]; then
+ CONFOPTS="${CONFOPTS} --with-opencl=1"
+ fi
+
+ # Add hwloc support
+ if [ -f "/usr/lib/libhwloc.so" ]; then
+ CONFOPTS="${CONFOPTS} --with-hwloc=1 --with-hwloc-pkg-config=/usr/lib/pkgconfig/"
+ fi
+
+ # Add CGNS support
+ if [ -f "/usr/lib/libcgns.so" ]; then
+ CONFOPTS="${CONFOPTS} --with-cgns=1"
+ fi
+
+ # Add PNG support
+ if [ -f "/usr/lib/libpng.so" ]; then
+ CONFOPTS="${CONFOPTS} --with-png=1 --with-png-pkg-config=/usr/lib/pkgconfig/"
+ fi
+
+ # Add YAML support
+ if [ -f "/usr/lib/libyaml.so" ]; then
+ CONFOPTS="${CONFOPTS} --with-yaml=1 --with-yaml-pkg-config=/usr/lib/pkgconfig/"
+ fi
+
+ # if --with-debugging=1 is set then PETSC_ARCH is automatically set to
+ # "linux-c-debug" for some things, so _config should be changed to "linux-c-debug"
+ #CONFOPTS="${CONFOPTS} --with-debugging=1"
+
+ dirpkg=${srcdir}/petsc/${_petsc_arch}/externalpackages/
+
+ export PETSC_DIR="${srcdir}/petsc"
+ export PETSC_ARCH="${_petsc_arch}"
+
+ python ./configure LDFLAGS="$LDFLAGS" \
+ --prefix=/usr/petsc/${_config} \
+ --MAKEFLAGS="$MAKEFLAGS" \
+ $(for (( i=1; i<=${#CONFOPTS[@]}; i++)); do echo "${CONFOPTS[$i]}"; done)
+ make clean
+ make all
}
package() {
- cd petsc
+ cd petsc
- _build_dir="${srcdir}/petsc"
- _install_dir=/usr/petsc/${_config}
+ _build_dir="${srcdir}/petsc"
+ _install_dir=/usr/petsc/${_config}
- export PETSC_DIR=${_build_dir}
- export PETSC_ARCH="${_petsc_arch}"
+ export PETSC_DIR=${_build_dir}
+ export PETSC_ARCH="${_petsc_arch}"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" install
- # documentation
- # Note: the hyperlinks between documentation, tutorials and examples are
- # not perfect yet
- #mkdir -p ${pkgdir}/usr/share/doc/petsc/
- #cp -r ${_build_dir}/docs ${pkgdir}/usr/share/doc/petsc/
+ # install license
+ install -Dm 644 ${_build_dir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- # src for tutorials
- #find ./src -path '*examples*' -type f -exec \
- # install -Dm 644 "{}" "${pkgdir}/usr/share/doc/petsc/{}" \;
+ mkdir -p "${pkgdir}/etc/profile.d"
+ echo "export PETSC_DIR=${_install_dir}" > "${pkgdir}/etc/profile.d/petsc.sh"
+ chmod +x "${pkgdir}/etc/profile.d/petsc.sh"
- # html versions of header files
- #mkdir -p ${pkgdir}/usr/share/doc/petsc/include
- #cp -r ${_build_dir}/include/*.html ${pkgdir}/usr/share/doc/petsc/include/
+ # show where the shared libraries are
+ install -dm 755 "${pkgdir}/etc/ld.so.conf.d/"
+ echo "${_install_dir}/lib" > "${pkgdir}/etc/ld.so.conf.d/petsc.conf"
- # install license (even though there is no such word as licenses)
- install -Dm 644 ${_build_dir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
- mkdir -p "${pkgdir}/etc/profile.d"
- echo "export PETSC_DIR=${_install_dir}" > "${pkgdir}/etc/profile.d/petsc.sh"
- chmod +x "${pkgdir}/etc/profile.d/petsc.sh"
-
- # show where the shared libraries are
- install -dm 755 "${pkgdir}/etc/ld.so.conf.d/"
- echo "${_install_dir}/lib" > "${pkgdir}/etc/ld.so.conf.d/petsc.conf"
-
- sed -i "s#-L${_build_dir}/${_petsc_arch}/lib ##" "${pkgdir}${_install_dir}/lib/pkgconfig/PETSc.pc"
+ sed -i "s#-L${_build_dir}/${_petsc_arch}/lib ##" "${pkgdir}${_install_dir}/lib/pkgconfig/PETSc.pc"
}
