tpetsc4py_newuser.patch not needed; pkgconf→makedepends - petsc-git-PKGBUILD … | |
git clone git://src.adamsgaard.dk/petsc-git-PKGBUILD | |
Log | |
Files | |
Refs | |
--- | |
commit eb332664bd9e49033b865c024e616dd82db8c0d9 | |
parent 797eae7e2136892b394836ecd75cd45b3fbb1aa1 | |
Author: eDgar <eDgar_|at|_openmail.cc> | |
Date: Tue, 21 Sep 2021 12:21:59 -0500 | |
petsc4py_newuser.patch not needed; pkgconf→makedepends | |
Diffstat: | |
M .SRCINFO | 9 ++++----- | |
M .gitignore | 1 + | |
M PKGBUILD | 11 ++++------- | |
D petsc4py_newuser.patch | 11 ----------- | |
M test_optdepends.sh | 4 ---- | |
5 files changed, 9 insertions(+), 27 deletions(-) | |
--- | |
diff --git a/.SRCINFO b/.SRCINFO | |
t@@ -1,7 +1,7 @@ | |
pkgbase = petsc-git | |
pkgdesc = Portable, extensible toolkit for scientific computation | |
- pkgver = 3.15.4.27.g1085e15b135 | |
- pkgrel = 2 | |
+ pkgver = 3.15.4.31.g36206f8ec7e | |
+ pkgrel = 1 | |
url = https://gitlab.com/petsc/petsc | |
arch = i686 | |
arch = x86_64 | |
t@@ -10,6 +10,7 @@ pkgbase = petsc-git | |
makedepends = gcc-fortran | |
makedepends = cmake | |
makedepends = sowing | |
+ makedepends = pkgconf | |
makedepends = git | |
makedepends = cython | |
makedepends = chrpath | |
t@@ -27,12 +28,10 @@ pkgbase = petsc-git | |
source = git+https://gitlab.com/petsc/petsc.git#branch=release | |
source = https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-wit… | |
source = test_optdepends.sh | |
- source = petsc4py_newuser.patch | |
source = blaslapack_download.patch | |
sha512sums = SKIP | |
sha512sums = b6a1d48aab1c2639a4c1cbd8b313ace253f1c36eedaa3de3508ffbd60… | |
- sha512sums = 2c2c48f6b87e24b6f5fccfd2a6eb0889d47385c0be7ba14614c55c774… | |
- sha512sums = 038f4f54cb8771590b528e41666f33095d9381bf07636c53841293a39… | |
+ sha512sums = 4561205ad12cb1f0031ad4cfcf2117a909002c475a992eede429b8af0… | |
sha512sums = af899ea1d06bf6d4cee1c1fe86902ba2772d1001caf00e89363c6217f… | |
pkgname = petsc-git | |
diff --git a/.gitignore b/.gitignore | |
t@@ -2,6 +2,7 @@ | |
pkg | |
src | |
*\~ | |
+\#*\# | |
*.bak | |
*.tar.gz | |
diff --git a/PKGBUILD b/PKGBUILD | |
t@@ -5,8 +5,8 @@ | |
_base=petsc | |
pkgname=("${_base}"-git "${_base}"-doc) | |
-pkgver=3.15.4.27.g1085e15b135 | |
-pkgrel=2 | |
+pkgver=3.15.4.31.g36206f8ec7e | |
+pkgrel=1 | |
_mainver="${pkgver:0:6}" | |
pkgdesc="Portable, extensible toolkit for scientific computation" | |
arch=('i686' 'x86_64') | |
t@@ -15,17 +15,15 @@ license=('BSD') | |
options=(!staticlibs) | |
depends=('openmpi' 'lapack' 'fftw' 'zlib' 'cython' | |
'python-mpi4py' "python-numpy" "eigen>=3" "openblas") | |
-makedepends=('gcc' 'gcc-fortran' 'cmake' 'sowing' | |
+makedepends=('gcc' 'gcc-fortran' 'cmake' 'sowing' "pkgconf" | |
'git' 'cython' 'chrpath' "hypre=2.18.2") | |
source=(git+${url}.git#branch=release | |
https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-with-docs-"$… | |
test_optdepends.sh | |
- petsc4py_newuser.patch | |
blaslapack_download.patch) | |
sha512sums=('SKIP' | |
'b6a1d48aab1c2639a4c1cbd8b313ace253f1c36eedaa3de3508ffbd6060e1def9… | |
- '2c2c48f6b87e24b6f5fccfd2a6eb0889d47385c0be7ba14614c55c774f8b915c3… | |
- '038f4f54cb8771590b528e41666f33095d9381bf07636c53841293a3937faeb86… | |
+ '4561205ad12cb1f0031ad4cfcf2117a909002c475a992eede429b8af0e06df44b… | |
'af899ea1d06bf6d4cee1c1fe86902ba2772d1001caf00e89363c6217fed9dd837… | |
_config=linux-c-opt | |
t@@ -93,7 +91,6 @@ export PETSC_ARCH=${_config} | |
prepare() { | |
patch -p1 -i blaslapack_download.patch | |
- patch -p1 -i petsc4py_newuser.patch | |
} | |
pkgver() { | |
diff --git a/petsc4py_newuser.patch b/petsc4py_newuser.patch | |
t@@ -1,11 +0,0 @@ | |
---- a/petsc/config/BuildSystem/config/packages/petsc4py.py 2021-09-17 2… | |
-+++ b/petsc/config/BuildSystem/config/packages/petsc4py.py 2021-09-17 2… | |
-@@ -58,7 +58,7 @@ | |
- | |
- # if installing as Superuser than want to return to regular user for cle… | |
- if self.installSudo: | |
-- newuser = self.installSudo+' -u $${SUDO_USER} ' | |
-+ newuser = '' | |
- else: | |
- newuser = '' | |
- | |
diff --git a/test_optdepends.sh b/test_optdepends.sh | |
t@@ -129,12 +129,8 @@ fi | |
OPENBLAS_SO="$(whereis -b libblas.so | cut -d' ' -f2)" | |
if [ -f "${OPENBLAS_SO}" ]; then | |
CONFOPTS+=" --with-openblas=1" | |
- # CONFOPTS+=" --with-openblas-lib=[-lopenblas,-lm,-lpthread,-lgfortran… | |
- # CONFOPTS+=" --with-openblas-include=/usr/include" | |
CONFOPTS+=" --with-openblas-pkg-config=" | |
CONFOPTS+="$(dirname $(pkgconf --path openblas))" | |
- # CONFOPTS+=" --download-openblas=0" | |
- CONFOPTS+=" --download-f2cblaslapack=0" | |
fi | |
# OpenCL: GPU computing |