summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Pfeiffer2019-12-11 13:52:19 +0100
committerChristian Pfeiffer2019-12-11 13:52:19 +0100
commitae96ec4c9d85c7879fbbd47e09b9de092e268f95 (patch)
treedf86d7e456144c3207f2064bd3573d921baacbf5
parentbcc78648b200263967ef91d4ef11972fbaa5157a (diff)
downloadaur-ae96ec4c9d85c7879fbbd47e09b9de092e268f95.tar.gz
Hypre 2.18.2
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD24
-rw-r--r--hypre-config-fix.patch36
3 files changed, 12 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abbbde70672..b1f9090fc5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
pkgbase = hypre
pkgdesc = A library for solving large, sparse linear systems on massively parallel computers
- pkgver = 2.16.0
- pkgrel = 2
- url = https://www.llnl.gov/casc/hypre/
+ pkgver = 2.18.2
+ pkgrel = 1
+ url = https://github.com/hypre-space/hypre
arch = x86_64
license = lgpl
makedepends = gcc-fortran
depends = superlu
depends = superlu_dist
depends = openmpi
- source = https://github.com/hypre-space/hypre/archive/v2.16.0.tar.gz
- source = hypre-config-fix.patch
- sha512sums = 3c08658aa9c55724c658584d829a3243445f853f416d3140840c97daa882ecd3712535213b8d9cdf2eb81e67e66e53e809a1275781446133c985b5a1a2b9fd4f
- sha512sums = 280f1577b20ae13f94b5c98fc05836a6784285bdb34a2622230861b02b464793ce915a81378838c0a222fd8d4341c40ae658ca5ff2099ec10d08a67f8cfa150d
+ source = https://github.com/hypre-space/hypre/archive/v2.18.2.tar.gz
+ sha512sums = 7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4
pkgname = hypre
diff --git a/PKGBUILD b/PKGBUILD
index 1bc6f5befd7..f65a4900091 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,36 +5,27 @@
# Contributor: Wink Saville <wink at saville dot com>
pkgname=hypre
-pkgver=2.16.0
-pkgrel=2
+pkgver=2.18.2
+pkgrel=1
pkgdesc="A library for solving large, sparse linear systems on massively parallel computers"
arch=('x86_64')
-url="https://www.llnl.gov/casc/hypre/"
+url="https://github.com/hypre-space/hypre"
license=('lgpl')
depends=('superlu' 'superlu_dist' 'openmpi')
makedepends=('gcc-fortran')
-source=(https://github.com/hypre-space/hypre/archive/v${pkgver}.tar.gz
- hypre-config-fix.patch)
-sha512sums=('3c08658aa9c55724c658584d829a3243445f853f416d3140840c97daa882ecd3712535213b8d9cdf2eb81e67e66e53e809a1275781446133c985b5a1a2b9fd4f'
- '280f1577b20ae13f94b5c98fc05836a6784285bdb34a2622230861b02b464793ce915a81378838c0a222fd8d4341c40ae658ca5ff2099ec10d08a67f8cfa150d')
-
-prepare() {
- _build_dir="${srcdir}/${pkgname}-${pkgver}${_suffix}"
- cd "${_build_dir}"
-
- patch -p1 -i ../hypre-config-fix.patch
-}
+source=(https://github.com/hypre-space/hypre/archive/v${pkgver}.tar.gz)
+sha512sums=('7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4')
build() {
_build_dir="${srcdir}/${pkgname}-${pkgver}${_suffix}"
cd "${_build_dir}/src"
-
+
# disable internal superlu and fei for now, not sure yet how to get it to use external superlu
CFLAGS="${CFLAGS} -fopenmp" CXXFLAGS="${CXXFLAGS} -fopenmp" LDFLAGS="${LDFLAGS} -lgomp" \
./configure --prefix="${pkgdir}/usr" --includedir="${pkgdir}/usr/include/hypre" --enable-shared \
--with-superlu --with-superlu-include=/usr/include/superlu --with-superlu-lib="-lsuperlu" \
--with-dsuperlu --with-dsuperlu-include=/usr/include/superlu_dist --with-dsuperlu-lib="-lsuperlu_dist" \
- --with-fei --with-blas --with-lapack --with-openmp --enable-fortran --with-mli --with-MPI
+ --with-blas --with-lapack --with-openmp --enable-fortran --with-mli --with-MPI
make
}
@@ -52,4 +43,3 @@ package() {
make install
}
-
diff --git a/hypre-config-fix.patch b/hypre-config-fix.patch
deleted file mode 100644
index f4bc467fdf8..00000000000
--- a/hypre-config-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur hypre-2.15.1/src/FEI_mv/femli/Makefile hypre-2.15.1-fix/src/FEI_mv/femli/Makefile
---- hypre-2.15.1/src/FEI_mv/femli/Makefile 2018-10-19 17:21:31.000000000 +0200
-+++ hypre-2.15.1-fix/src/FEI_mv/femli/Makefile 2018-12-16 19:15:59.962580300 +0100
-@@ -13,6 +13,8 @@
-
- include ../../config/Makefile.config
-
-+SYSTEM_LIBS = $(MPILIBDIRS) $(MPILIBS) $(MPIFLAGS) -lm ${SUPERLU_LIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}
-+
- CINCLUDES = ${INCLUDES} ${MPIINCLUDE}
-
- MLI_INCLUDES = \
-diff -Naur hypre-2.15.1/src/lib/Makefile hypre-2.15.1-fix/src/lib/Makefile
---- hypre-2.15.1/src/lib/Makefile 2018-10-19 17:21:31.000000000 +0200
-+++ hypre-2.15.1-fix/src/lib/Makefile 2018-12-16 19:15:54.485320700 +0100
-@@ -59,7 +59,7 @@
-
- SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX}
- SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\
-- ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS}
-+ ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS} ${SUPERLU_LIBS} ${DSUPERLU_LIBS}
-
-
- ##################################################################
-diff -Naur hypre-2.15.1/src/parcsr_ls/Makefile hypre-2.15.1-fix/src/parcsr_ls/Makefile
---- hypre-2.15.1/src/parcsr_ls/Makefile 2018-10-19 17:21:31.000000000 +0200
-+++ hypre-2.15.1-fix/src/parcsr_ls/Makefile 2018-12-16 19:15:59.961578800 +0100
-@@ -12,6 +12,8 @@
-
- include ../config/Makefile.config
-
-+SYSTEM_LIBS = $(MPILIBDIRS) $(MPILIBS) $(MPIFLAGS) -lm $(DSUPERLU_LIBS) $(LAPACKLIBDIRS) $(LAPACKLIBS)
-+
- ## Euclid specific macros taken from distributed_ls/Euclid
-
- CINCLUDES = ${INCLUDES} ${MPIINCLUDE}