diff options
| author | Mike Sullivan <mksully22@gmail.com> | 2019-02-06 16:26:35 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-02-08 19:07:21 +0000 |
| commit | cb85638e977cc83289200ec6c1a1d21bec399643 (patch) | |
| tree | 41d0316dec52f684a05ebbdd77e64833a5c302ff /testing/bees | |
| parent | b5fca7279cf14ae2c843d9649715f71a98b5626b (diff) | |
| download | aports-cb85638e977cc83289200ec6c1a1d21bec399643.tar.bz2 aports-cb85638e977cc83289200ec6c1a1d21bec399643.tar.xz | |
testing/bees: fix ppc64le build break and reenable
Diffstat (limited to 'testing/bees')
| -rw-r--r-- | testing/bees/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/bees/ppc64le_fix_min_compare.patch | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/testing/bees/APKBUILD b/testing/bees/APKBUILD index a9d110153f..2824433514 100644 --- a/testing/bees/APKBUILD +++ b/testing/bees/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Bradley Saulteaux <bradsoto@gmail.com> pkgname=bees pkgver=0.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Best-Effort Extent-Same, a btrfs dedup agent" url="https://github.com/Zygo/bees" -arch="all !ppc64le" +arch="all" license="GPL-3.0-or-later" depends="btrfs-progs" makedepends="btrfs-progs-dev util-linux-dev" @@ -12,6 +12,7 @@ install="" subpackages="$pkgname-openrc" source="${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz 10-pthread_getname1.patch + ppc64le_fix_min_compare.patch bees.initd" build() { @@ -31,4 +32,5 @@ package() { sha512sums="cd44d21959d3ab4dda255f0a4a57bd3aeecfb9fee6ea26d68a1b5f84d407f75bd0b442ecf4fefc5ac856dcd9af035f44ceeff77a8926b164f97a15350efcee33 bees-0.6.1.tar.gz 50c9cc16f094a0a69f31cf6e42601b9114344ea23a1455d6b5a3f18829ad03426ebdc37187af747bb74f51f75866c3a6da8805d0537af8e729a2f53819d52efb 10-pthread_getname1.patch +2e13a670184d71b64e04450adb182d0a6e842e1a7d561882e0a07ae4ea7a9ed15a3fcce03f61c5412eabdb2fadf559f221e21ffd10440c4b8b700f3eab02aab4 ppc64le_fix_min_compare.patch 093bc4c9604a0b28b39069e447d83800c91d0974fe4618ce5e5063e5c816b2d63c1b633710c592d76e8f6367d696283d6fa4a3a9561b09ce62fa28cabf8e55d0 bees.initd" diff --git a/testing/bees/ppc64le_fix_min_compare.patch b/testing/bees/ppc64le_fix_min_compare.patch new file mode 100644 index 0000000000..49cb49359d --- /dev/null +++ b/testing/bees/ppc64le_fix_min_compare.patch @@ -0,0 +1,11 @@ +--- a/src/fiemap.cc ++++ b/src/fiemap.cc +@@ -27,7 +27,7 @@ + if (argc > 2) { fm.fm_start = stoull(argv[2], nullptr, 0); } + if (argc > 3) { fm.fm_length = stoull(argv[3], nullptr, 0); } + if (argc > 4) { fm.fm_flags = stoull(argv[4], nullptr, 0); } +- fm.fm_length = min(fm.fm_length, FIEMAP_MAX_OFFSET - fm.fm_start); ++ fm.fm_length = min(fm.fm_length, (uint64_t)FIEMAP_MAX_OFFSET - fm.fm_start); + uint64_t stop_at = fm.fm_start + fm.fm_length; + uint64_t last_byte = fm.fm_start; + do { |