autu: Update to 1.1.3-1

2 files changed, 32 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65ce7fedfb0c..07a31b24f4aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
+# Generated by mksrcinfo v8
+# Thu Sep 13 19:41:56 UTC 2018
 pkgbase = knem
 	pkgdesc = High-Performance Intra-Node MPI Communication
-	pkgver = 1.1.2
+	pkgver = 1.1.3
 	pkgrel = 1
 	url = http://knem.gforge.inria.fr
 	install = knem.install
 	arch = any
-	license = bsd
+	license = BSD
 	makedepends = make
 	depends = hwloc
-	source = http://gforge.inria.fr/frs/download.php/34521/knem-1.1.2.tar.gz
-	sha256sums = 4523ec59b15bd69db7956372d31e5cb8054627673a41154530310e9c4b8ea13e
+	source = http://gforge.inria.fr/frs/download.php/37186/knem-1.1.3.tar.gz
+	source = 0000-gentoo-knem-1.1.3-setup_timer.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch?id=768341030da4acb06798dc0d444ba8ca9dfea5f8
+	sha256sums = 50d3c4a20c140108b8ce47aaafd0ade0927d6f507e1b5cc690dd6bddeef30f60
+	sha256sums = d0871602c83047adf60fcc96e34cf4d2d79b9b4b76c3842f64b731fa91cf4380
 
 pkgname = knem
 
diff --git a/PKGBUILD b/PKGBUILD
index 38bf19cbe3aa..fe1d1780a922 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,52 @@
 # Maintainer:  Chris Severance aur.severach aATt spamgourmet dott com
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 
+# TODO: Move out of /opt
+# TODO: Implement DKMS
+# TODO: Provide simple test instructions
+
 set -u
-_relno='34521'
 pkgname='knem'
-pkgver='1.1.2'
+#pkgver='1.1.2'; _relno='34521'
+pkgver='1.1.3'; _relno='37186'
 pkgrel='1'
 pkgdesc='High-Performance Intra-Node MPI Communication'
 arch=('any')
 url='http://knem.gforge.inria.fr'
-license=('bsd')
+license=('BSD')
 depends=('hwloc')
 makedepends=('make')
-install=('knem.install')
+install='knem.install'
 _verwatch=("${url}/download/" "http://gforge.inria.fr/frs/download.php/[0-9]\+/${pkgname}-\([0-9\.]\+\)\.tar\.gz" 'l')
-#source=(http://runtime.bordeaux.inria.fr/knem/download/knem-${pkgver}.tar.gz)
-source=("http://gforge.inria.fr/frs/download.php/${_relno}/knem-${pkgver}.tar.gz")
-sha256sums=('4523ec59b15bd69db7956372d31e5cb8054627673a41154530310e9c4b8ea13e')
+_srcdir="${pkgname}-${pkgver}"
+source=(
+  #"http://runtime.bordeaux.inria.fr/knem/download/knem-${pkgver}.tar.gz"
+  "http://gforge.inria.fr/frs/download.php/${_relno}/knem-${pkgver}.tar.gz"
+  "0000-gentoo-knem-1.1.3-setup_timer.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch?id=768341030da4acb06798dc0d444ba8ca9dfea5f8"
+)
+sha256sums=('50d3c4a20c140108b8ce47aaafd0ade0927d6f507e1b5cc690dd6bddeef30f60'
+            'd0871602c83047adf60fcc96e34cf4d2d79b9b4b76c3842f64b731fa91cf4380')
 
 prepare() {
   set -u
-  cd "${pkgname}-"*/
-  ./configure --prefix='/opt/knem'
+  cd "${_srcdir}"
+  patch -Nup1 -i "${srcdir}/0000-gentoo-knem-1.1.3-setup_timer.patch"
   set +u
 }
 
 build() {
   set -u
-  cd "${pkgname}-"*/
-  make -s -j "$(nproc)"
+  cd "${_srcdir}"
+  [ -s 'Makefile' ] || ./configure --prefix='/opt/knem'
+  #[ -s 'Makefile' ] || ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc'
+  make -s
   set +u
 }
 
 package() {
   set -u
-  cd "${pkgname}-"*/
-  make install DESTDIR="${pkgdir}"
+  cd "${_srcdir}"
+  make -j1 install DESTDIR="${pkgdir}"
   set +u
 }
 set +u