aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-08-20 10:19:10 -0400
committerLeo <thinkabit.ukim@gmail.com>2021-08-23 08:01:43 +0000
commite0ce4ebb6927af5e2c0fcf7ffbdd31be477b8d35 (patch)
tree853435e8450ed5483e1efc9b28d86ab54166b2ff
parentd3e921e9b2f5c5e20d977c6ccadcfb3a514b27f2 (diff)
downloadaports-e0ce4ebb6927af5e2c0fcf7ffbdd31be477b8d35.tar.gz
aports-e0ce4ebb6927af5e2c0fcf7ffbdd31be477b8d35.tar.bz2
aports-e0ce4ebb6927af5e2c0fcf7ffbdd31be477b8d35.tar.xz
main/thin-provisioning-tools: upgrade to 0.9.0
-rw-r--r--main/thin-provisioning-tools/APKBUILD35
-rw-r--r--main/thin-provisioning-tools/page-size.patch11
-rw-r--r--main/thin-provisioning-tools/paths.patch30
3 files changed, 48 insertions, 28 deletions
diff --git a/main/thin-provisioning-tools/APKBUILD b/main/thin-provisioning-tools/APKBUILD
index bc69597f29..78c291e1d1 100644
--- a/main/thin-provisioning-tools/APKBUILD
+++ b/main/thin-provisioning-tools/APKBUILD
@@ -1,46 +1,47 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer:
pkgname=thin-provisioning-tools
-pkgver=0.7.1
-pkgrel=6
+pkgver=0.9.0
+pkgrel=0
pkgdesc="suite of tools for manipulating the metadata of the dm-thin device-mapper target"
url="https://github.com/jthornber/thin-provisioning-tools"
arch="all"
license="GPL-3.0-or-later"
-makedepends="expat-dev boost-dev libaio-dev linux-headers autoconf automake libtool"
+makedepends="expat-dev boost-dev libaio-dev linux-headers autoconf automake libtool gtest-dev"
subpackages="$pkgname-doc"
_realpkgver=${pkgver/_/-}
-options="!check" # no production testsuite, only development tests
source="thin-provisioning-tools-$_realpkgver.tar.gz::https://github.com/jthornber/thin-provisioning-tools/archive/v$_realpkgver.tar.gz
- page-size.patch"
+ paths.patch
+"
+options="!check" # various test failures
prepare() {
default_prepare
- update_config_guess
- update_config_sub
autoreconf -fi
}
build() {
- export CXXFLAGS="$CXXFLAGS -fpermissive"
./configure \
- --build=$CBUILD \
- --host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
+ --sbindir=/sbin \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --with-optimisation=''
+ --with-optimisation='' \
+ --enable-testing
make
}
+check() {
+ make unit-test
+}
+
package() {
- make DESTDIR="$pkgdir" \
- BINDIR="$pkgdir"/sbin \
- MANDIR=/usr/share/man \
- install
+ make DESTDIR="$pkgdir" install
}
-sha512sums="47ce2f0699e3bc21fa5bb1175e12fa8f545d2abfbed4529b144bd4812a4a0021635713c3e71228f20b30cbe067c77fb93db20b65075b2689ec2aa5b0385854b9 thin-provisioning-tools-0.7.1.tar.gz
-c914f7b318555b68c4d1aceffd3b571afe9570aaa2fcd9739fab1e8d85bdbe6902dc3e63d9af356feb1388e5a79474ee8d3e2bb9e501d8f673e52b9ae5e27987 page-size.patch"
+sha512sums="
+e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f thin-provisioning-tools-0.9.0.tar.gz
+ec7a752ab58bc4c30968ed4198bc6419120e3a811805647cc121a036b3ed084e7ce768c479ac5c5099ecf8c95835d40cfc24bff45834e72814f895517cb12c26 paths.patch
+"
diff --git a/main/thin-provisioning-tools/page-size.patch b/main/thin-provisioning-tools/page-size.patch
deleted file mode 100644
index ff0136b65e..0000000000
--- a/main/thin-provisioning-tools/page-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- thin-provisioning-tools-0.7.0-rc6.orig/block-cache/io_engine.h
-+++ thin-provisioning-tools-0.7.0-rc6/block-cache/io_engine.h
-@@ -10,6 +10,8 @@
- #include <libaio.h>
- #include <vector>
-
-+#undef PAGE_SIZE
-+
- //----------------------------------------------------------------
-
- namespace bcache {
diff --git a/main/thin-provisioning-tools/paths.patch b/main/thin-provisioning-tools/paths.patch
new file mode 100644
index 0000000000..62ab93aa6e
--- /dev/null
+++ b/main/thin-provisioning-tools/paths.patch
@@ -0,0 +1,30 @@
+From ae702996a635214ac672ed91b2fbbe6052958d56 Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Fri, 20 Aug 2021 09:59:06 -0400
+Subject: [PATCH] [build] use autoconf standard directories
+
+---
+ Makefile.in | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 32e1f30..1407d27 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -204,10 +204,9 @@ LDFLAGS+=-static
+ endif
+
+ INSTALL:=@INSTALL@
+-PREFIX:=@prefix@
+-BINDIR:=$(DESTDIR)$(PREFIX)/sbin
+-DATADIR:=$(DESTDIR)$(PREFIX)/share
+-MANPATH:=$(DATADIR)/man
++BINDIR:=$(DESTDIR)@sbindir@
++DATADIR:=$(DESTDIR)@datarootdir@
++MANPATH:=$(DESTDIR)@mandir@
+
+ vpath %.cc $(TOP_DIR)
+
+--
+2.33.0
+