aboutsummaryrefslogtreecommitdiffstats
path: root/main/bcache-tools
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-07-16 14:32:26 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-07-17 07:57:29 +0000
commitbe384e876f94f851e647c40e3d3522931302ac48 (patch)
treebc2b8f0f56b7df7ce6caa5a222816bb0e3706c56 /main/bcache-tools
parent3bc33b297bb4430a52c7632757b8dc73c1eb26ca (diff)
downloadaports-be384e876f94f851e647c40e3d3522931302ac48.tar.bz2
aports-be384e876f94f851e647c40e3d3522931302ac48.tar.xz
main/bcache-tools: build with eudev, fix build with gcc5
Diffstat (limited to 'main/bcache-tools')
-rw-r--r--main/bcache-tools/APKBUILD17
-rw-r--r--main/bcache-tools/gcc5.patch11
2 files changed, 22 insertions, 6 deletions
diff --git a/main/bcache-tools/APKBUILD b/main/bcache-tools/APKBUILD
index 37db544e29..3ab6c87fde 100644
--- a/main/bcache-tools/APKBUILD
+++ b/main/bcache-tools/APKBUILD
@@ -1,17 +1,19 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=bcache-tools
pkgver=1.0.8
-pkgrel=0
+pkgrel=1
pkgdesc="tools for managing bcache"
url="http://bcache.evilpiepirate.org/"
arch="all"
license="GPL"
depends=""
depends_dev=""
-makedepends="$depends_dev udev-dev util-linux-dev linux-headers coreutils"
+makedepends="$depends_dev eudev-dev util-linux-dev linux-headers coreutils"
install=""
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/g2p/bcache-tools/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/g2p/bcache-tools/archive/v$pkgver.tar.gz
+ gcc5.patch
+ "
_builddir="$srcdir"/bcache-tools-$pkgver
prepare() {
@@ -40,6 +42,9 @@ package() {
rm -f "$pkgdir"/usr/lib/*.la
}
-md5sums="d1632a7c37214e0aa38f3cf95624fa46 bcache-tools-1.0.8.tar.gz"
-sha256sums="d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c bcache-tools-1.0.8.tar.gz"
-sha512sums="21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc bcache-tools-1.0.8.tar.gz"
+md5sums="d1632a7c37214e0aa38f3cf95624fa46 bcache-tools-1.0.8.tar.gz
+49cc0d487c18a21d1349b313b8feb17b gcc5.patch"
+sha256sums="d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c bcache-tools-1.0.8.tar.gz
+6fafd1409d35854d084b7a632621cd994ba996ab1ea031a29353b0dcb6c1913b gcc5.patch"
+sha512sums="21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc bcache-tools-1.0.8.tar.gz
+16928c4d78c00f8be73c3bfb4ccc63d1e3eeabcc2da87569f51c240ba018b2dd6b5d6b828601192e8b59cd82b4931b57318f7f0e2f9af169f41cc7b779ce26ab gcc5.patch"
diff --git a/main/bcache-tools/gcc5.patch b/main/bcache-tools/gcc5.patch
new file mode 100644
index 0000000000..0a80f0d93f
--- /dev/null
+++ b/main/bcache-tools/gcc5.patch
@@ -0,0 +1,11 @@
+--- ./bcache.c.orig
++++ ./bcache.c
+@@ -115,7 +115,7 @@
+ 0x9AFCE626CE85B507ULL
+ };
+
+-inline uint64_t crc64(const void *_data, size_t len)
++uint64_t crc64(const void *_data, size_t len)
+ {
+ uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
+ const unsigned char *data = _data;