summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD48
2 files changed, 33 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e059f4903af2..ed14291385b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pmdk
pkgdesc = Persistent Memory Development Kit
- pkgver = 1.8
+ pkgver = 1.11.1
pkgrel = 1
url = https://pmem.io/
arch = x86_64
@@ -9,13 +9,13 @@ pkgbase = pmdk
depends = ndctl>=63
optdepends = libfabric>=1.4.2: required by librpmem
provides = libpmem
+ provides = libpmem2
provides = libpmemobj
provides = libpmemblk
provides = libpmemlog
provides = libpmempool
provides = librpmem
- source = pmdk-1.8.tar.gz::https://github.com/pmem/pmdk/archive/1.8.tar.gz
- sha1sums = ec8941117077bd5b9e766585e5223734dbd0329e
+ source = pmdk-1.11.1.tar.gz::https://github.com/pmem/pmdk/archive/1.11.1.tar.gz
+ sha1sums = e180377efa67f3db8c5fd322737e4f1f1cfb4eb9
pkgname = pmdk
-
diff --git a/PKGBUILD b/PKGBUILD
index f5d83c35a4a1..3b42e7650cee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
# Maintainer: Darren Ng <$(base64 --decode <<<'ZGFycmVuMTk5NzA4MTBAZ21haWwuY29tCg==')>
+# Co-Maintainer: Simon Krogmann <$(base64 --decode <<<'cy5rcm9nbWFubkB5YWhvby5jb20K')>
_org=pmem
pkgname=pmdk
-pkgver=1.8
+pkgver=1.11.1
pkgrel=1
pkgdesc="Persistent Memory Development Kit"
arch=('x86_64')
@@ -19,6 +20,7 @@ optdepends=(
)
provides=(
'libpmem'
+ 'libpmem2'
'libpmemobj'
'libpmemblk'
'libpmemlog'
@@ -28,42 +30,50 @@ provides=(
backup=()
options=()
source=("$pkgname-$pkgver.tar.gz::https://github.com/$_org/$pkgname/archive/$pkgver.tar.gz")
-sha1sums=('ec8941117077bd5b9e766585e5223734dbd0329e')
+sha1sums=('e180377efa67f3db8c5fd322737e4f1f1cfb4eb9')
prepare() {
- # return 1
+
+ # grep -nr -i -e 'ix/etc' -e 'ix)/etc'
+ # grep -nr -Fe 'export sysconfdir'
+ # src/pmdk-1.8/src/common.inc:220:export sysconfdir := $(prefix)/etc
+
cd "$pkgname-$pkgver"
+ sed -i 's#^export sysconfdir.*$#export sysconfdir := /etc#g' src/common.inc
+
}
build() {
cd "$pkgname-$pkgver"
- make -j$(nproc)
+ # grep -nr -Fe '?='
+ /bin/time -f '\n %E\n' make LIB_PREFIX=lib prefix=/usr PREFIX=/usr
}
-check() {
-
- return 0
-
- cd "$pkgname-$pkgver/src/test" || return 1
- # make -k test
- make test
- cp -v testconfig.sh.example testconfig.sh
- ./RUNTESTS
-
-}
+# https://github.com/pmem/pmdk#testing-libraries-on-linux-and-freebsd
+# https://github.com/pmem/pmdk/blob/master/src/test/README
+# check() {
+# cd "$pkgname-$pkgver/src/test" || return 1
+# make -k test
+# cp -v testconfig.sh.example testconfig.sh
+# ./RUNTESTS
+# }
package() {
cd "$pkgname-$pkgver"
- make prefix="/usr" DESTDIR="$pkgdir/" install
+
+ # pkgdir=/home/darren/.cache/yay/pmdk/pkg
+ make LIB_PREFIX=lib prefix=/usr PREFIX=/usr DESTDIR="$pkgdir/" install
# Fix 01
- mv -v "$pkgdir/usr/lib64" "$pkgdir/usr/lib"
+ # mv -v "$pkgdir/usr/lib64" "$pkgdir/usr/lib"
# Fix 02
# pacman -Qo /usr/share/bash-completion/completions/* | grep -v "owned by bash-completion"
- install -Dvm644 "$pkgdir/usr/etc/bash_completion.d/pmempool" "$pkgdir/usr/share/bash-completion/completions/pmempool"
- rm -rv "$pkgdir/usr/etc"
+ install -Dvm644 "$pkgdir/etc/bash_completion.d/pmempool" "$pkgdir/usr/share/bash-completion/completions/pmempool"
+ rm -v "$pkgdir/etc/bash_completion.d/pmempool"
+ rmdir -v "$pkgdir/etc/bash_completion.d"
+ rmdir -v "$pkgdir/etc"
# Fix 03
# pmdk E: Insecure RPATH '/usr/local/lib' in file ('usr/lib/libpmem<*>.so.1.0.0')