aboutsummaryrefslogtreecommitdiffstats
path: root/main/btrfs-progs
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2014-11-08 03:06:49 +0100
committerCarlo Landmeter <clandmeter@gmail.com>2014-11-08 03:06:49 +0100
commit2b7dbbfb0da513d569b457478126356d4396316f (patch)
tree38f886087c8684c83cab893963b53730dde5d6e0 /main/btrfs-progs
parent70003f2e881055898dafe2ad01c0a6cdc474eae9 (diff)
downloadaports-2b7dbbfb0da513d569b457478126356d4396316f.tar.bz2
aports-2b7dbbfb0da513d569b457478126356d4396316f.tar.xz
main/btrfs-progs: upgrade to 3.17.1
Diffstat (limited to 'main/btrfs-progs')
-rw-r--r--main/btrfs-progs/APKBUILD18
-rw-r--r--main/btrfs-progs/includes.patch13
2 files changed, 22 insertions, 9 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index cfed9a8809..4a423b9559 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=btrfs-progs
-pkgver=3.16
+pkgver=3.17.1
pkgrel=0
pkgdesc="Tools for the btrfs"
url="https://btrfs.wiki.kernel.org/"
@@ -11,7 +11,7 @@ makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev
lzo-dev asciidoc xmlto"
install=
subpackages="$pkgname-doc $pkgname-dev"
-source="https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${pkgver}.tar.xz
+source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${pkgver}.tar.xz
includes.patch
musl-compat.patch"
@@ -27,7 +27,7 @@ prepare() {
build() {
cd "$_builddir"
- make CFLAGS="$CFLAGS" prefix=/usr || return 1
+ DISABLE_BACKTRACE=1 make CFLAGS="$CFLAGS" prefix=/usr || return 1
}
package() {
@@ -40,12 +40,12 @@ dev() {
mv "$pkgdir"/usr/lib/*.so* "$subpkgdir"/usr/lib
}
-md5sums="26035e2ff30513dfeeb2538cacf954b2 btrfs-progs-v3.16.tar.xz
-51609651140dff3766b00d356b05175b includes.patch
+md5sums="eda0addb9a4cd82f66e06c42c02b9151 btrfs-progs-v3.17.1.tar.xz
+a79fe97241a26ec2a4be9fc566fa8e29 includes.patch
13aae8338d103c1bdfab26ee324cfe20 musl-compat.patch"
-sha256sums="9a7651df6c0430b75fa0637519ca5be29a756684dada241b4398007ae3cb0b5e btrfs-progs-v3.16.tar.xz
-22db993d733e763d55684a58b5aa3757d555c16a9178381bb83acec7abf0eca1 includes.patch
+sha256sums="6c01579c7b858c175aaed6b3b087dadaa38efb8e590a6928f1afe86bb8faaaab btrfs-progs-v3.17.1.tar.xz
+dc66938029c887fd29e69ce53f8acc8ac0f01fa49fede3b08c00f2f7acdb1f2a includes.patch
6ef4d5633aa715095610de3045187ba39daaf5518629eb4e6ef4e143fb486531 musl-compat.patch"
-sha512sums="dd1f4bc13e62623792121d0f2a2a388be85bae4eec4abc348e0d21949fefa58863e7bf56515dd57022c312ee02d2fa76cc7b1a1c2d78a36532961b22b410a4db btrfs-progs-v3.16.tar.xz
-816482d72d6f6b1dc10ad01858f6d38ad7593e35167000844024cce50cfd3f54d53de0341b66efe912b0f0140c60cb51665843bde1779efb6f65a53bdc20fecb includes.patch
+sha512sums="a56d6849bcb5b9f6be75a6cf19d783a628bbe8e18a0382474b6818a4563d673f4ca356552cf8989284b6cdd610b3cb6a61742c6d4efe336ab7d838f0fba89b5a btrfs-progs-v3.17.1.tar.xz
+2040092c94096da283ca69ec0dd910ebd5329840df86e607226cc054e8b29112720c798b63f9630e35ed28c7c057bb433b09d8aec8df8c4793a6f1ecaa8be846 includes.patch
c7634159e591bf969dad8fa51d48668c999de8efc8cb6ff26b7a047b27a8cd18b1a93494dbf6d584afcbc6e3f40ae98ea3a33d188ee16b06ad7eb564efccde9a musl-compat.patch"
diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch
index 393399a999..6836acb506 100644
--- a/main/btrfs-progs/includes.patch
+++ b/main/btrfs-progs/includes.patch
@@ -24,3 +24,16 @@ index bb03194e127e..28f832a2e625 100644
#include <stdint.h>
#define ptr_to_u64(x) ((u64)(uintptr_t)x)
+--- a/rbtree.h
++++ b/rbtree.h
+@@ -38,6 +38,10 @@
+ extern "C" {
+ #endif
+
++#ifndef __always_inline
++#define __always_inline inline __attribute__((always_inline))
++#endif
++
+ struct rb_node {
+ unsigned long __rb_parent_color;
+ struct rb_node *rb_right;