summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Beucher2021-02-11 13:14:43 +1100
committerRomain Beucher2021-02-11 13:14:43 +1100
commitfc56802da2098606e502768919cae1c3debde4c1 (patch)
tree777028e2f99651bbdd8621a92fa8a4ac884ec4ac
parentb587e5e212de6dfff2af865bad1b56c40ca47020 (diff)
downloadaur-fc56802da2098606e502768919cae1c3debde4c1.tar.gz
Update package
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD70
2 files changed, 16 insertions, 66 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2c9fcc100499..2e9241561e90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,6 @@
pkgbase = underworld2-git
- pkgver = r1454.078b148
+ pkgdesc = Geodynamics modelling code
+ pkgver = 2.10
pkgrel = 1
url = http://underworldcode.org
arch = x86_64
@@ -7,13 +8,14 @@ pkgbase = underworld2-git
makedepends = git
makedepends = gcc-fortran
makedepends = swig
+ makedepends = scons
depends = openmpi
depends = hdf5-openmpi
depends = petsc
- depends = python2-matplotlib
- depends = python2-numpy
- depends = python2-mpi4py
- depends = python2-h5py-openmpi
+ depends = python-matplotlib
+ depends = python-numpy
+ depends = python-mpi4py
+ depends = python-h5py-openmpi
depends = swig
provides = underworld2
conflicts = underworld2
diff --git a/PKGBUILD b/PKGBUILD
index 8d8af7cba792..23d2eab46fdb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,74 +1,22 @@
-# Maintainer: Romain Beucher <rbeucher@thermo-geology.fr>
+# Maintainer: Romain Beucher <romain@rbeucher.com>
+
pkgname=underworld2-git
-pkgver=r1454.078b148
+pkgver=2.10
pkgrel=1
-pkgdesc=""
+pkgdesc="Geodynamics modelling code"
arch=('x86_64')
url="http://underworldcode.org"
license=('GPL')
-groups=()
-depends=('openmpi' 'hdf5-openmpi' 'petsc' 'python2-matplotlib' 'python2-numpy' 'python2-mpi4py'
- 'python2-h5py-openmpi' 'swig' )
-makedepends=('git' 'gcc-fortran' 'swig') # 'bzr', 'git', 'mercurial' or 'subversion'
+depends=('openmpi' 'hdf5-openmpi' 'petsc' 'python-matplotlib' 'python-numpy' 'python-mpi4py'
+ 'python-h5py-openmpi' 'swig' )
+makedepends=('git' 'gcc-fortran' 'swig' 'scons')
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
-replaces=()
-backup=()
-options=()
-install=
source=('underworld2::git+https://github.com/underworldcode/underworld2#branch=development')
noextract=()
md5sums=('SKIP')
-_install_dir=/opt
-
-pkgver() {
- cd "$srcdir/${pkgname%-git}"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
- cd "$srcdir/${pkgname%-git}"
- sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
- -e "s|python -c|python2 -c|" \
- -i $(find . -name '*.py')
- export PETSC_DIR=/opt/petsc/linux-c-opt/
- export PETSC_INC_DIR=/opt/petsc/linux-c-opt/include
- export PETSC_LIB_DIR=/opt/petsc/linux-c-opt/lib
-
-}
-
-build() {
- cd "$srcdir/${pkgname%-git}"
- cd libUnderworld
- ./configure.py
- ./compile.py
- rm -fr h5py_ext
- rm .sconsign.dblite
- rm -fr .sconf_temp
- cd build
- rm -fr libUnderworldPy
- rm -fr StGermain
- rm -fr gLucifer
- rm -fr Underworld
- rm -fr StgFEM
- rm -fr StgDomain
- rm -fr PICellerator
- rm -fr Solvers
-}
-
package() {
- _build_dir="$srcdir/${pkgname%-git}"
-
- mkdir -p ${pkgdir}/opt
- cp -rf $_build_dir ${pkgdir}/opt
-
- mkdir -p ${pkgdir}/usr/share/licenses/$pkgname
- cp $_build_dir/LICENSE.md ${pkgdir}/usr/share/licenses/$pkgname/
-
- mkdir -p ${pkgdir}/etc/profile.d
- echo "export PYTHONPATH=$_install_dir/underworld2:$_install_dir/underworld2/glucifer:$PYTHONPATH" > ${pkgdir}/etc/profile.d/underworld.sh
- chmod +x ${pkgdir}/etc/profile.d/underworld.sh
+ cd ${pkgname%-git}
+ pip install --root="${pkgdir}" . -vvv
}