diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-07-10 23:27:14 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-07-10 23:27:14 +0200 |
| commit | e982e33cbe42c1a3a46c049976c71f2631f393bd (patch) | |
| tree | 8606e3590402f003e70941ba05983470cb48aabd /main/btrfs-progs | |
| parent | 7baefde1f7ff4186dfc44330ff0d65a0665c5f0b (diff) | |
| download | aports-e982e33cbe42c1a3a46c049976c71f2631f393bd.tar.bz2 aports-e982e33cbe42c1a3a46c049976c71f2631f393bd.tar.xz | |
main/btrfs-progs: remove patch for pthread_tryjoin_np
The most recent musl version supports pthread_tryjoin_np now.
Diffstat (limited to 'main/btrfs-progs')
| -rw-r--r-- | main/btrfs-progs/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch | 11 | ||||
| -rw-r--r-- | main/btrfs-progs/APKBUILD | 12 |
2 files changed, 4 insertions, 19 deletions
diff --git a/main/btrfs-progs/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch b/main/btrfs-progs/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch deleted file mode 100644 index a19e07f879..0000000000 --- a/main/btrfs-progs/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- btrfs-progs-v4.2.3/chunk-recover.c -+++ btrfs-progs-v4.2.3/chunk-recover.c.new -@@ -883,7 +883,7 @@ - for (i = 0; i < devidx; i++) { - if (dev_scans[i].bytenr == -1) - continue; -- ret = pthread_tryjoin_np(t_scans[i], -+ ret = pthread_join(t_scans[i], - (void **)&t_rets[i]); - if (ret == EBUSY) { - all_done = 0; diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index f2f72e42bf..fce83eb1a9 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs pkgver=4.5.3 -pkgrel=0 +pkgrel=1 pkgdesc="BTRFS filesystem utilities" url="https://btrfs.wiki.kernel.org/" arch="all" @@ -17,7 +17,6 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion $pkgn source="https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz includes.patch musl-compat.patch - 0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch " _builddir="$srcdir"/$pkgname-v$pkgver @@ -74,13 +73,10 @@ extra() { md5sums="3feb593cb52df7570769559366d5e320 btrfs-progs-v4.5.3.tar.xz a79fe97241a26ec2a4be9fc566fa8e29 includes.patch -204ac1381fc0c373bc809d6a453615f2 musl-compat.patch -f8a34b011e83307b71ca62a319d70a49 0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch" +204ac1381fc0c373bc809d6a453615f2 musl-compat.patch" sha256sums="e6e79608d81ccda62ad877c20e4d0868dc68e570ba42f4c94e66bf5e8ee0ebd3 btrfs-progs-v4.5.3.tar.xz dc66938029c887fd29e69ce53f8acc8ac0f01fa49fede3b08c00f2f7acdb1f2a includes.patch -fa678596c2979f929447f2fdface52823d9bea93d0f49d086ada07b7e57bae34 musl-compat.patch -e1264e4bbe910ee92a45d2a8afe60f812e986b68ccf153559c3e090031256bf5 0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch" +fa678596c2979f929447f2fdface52823d9bea93d0f49d086ada07b7e57bae34 musl-compat.patch" sha512sums="7bb15728577cdc56773e87583196ed36e15a4c417f03816e8a101506070e667b8e51f66fcf98095ddc20c9ce10da0b78de1171e9c8a6cb20a4811fd35d508961 btrfs-progs-v4.5.3.tar.xz 2040092c94096da283ca69ec0dd910ebd5329840df86e607226cc054e8b29112720c798b63f9630e35ed28c7c057bb433b09d8aec8df8c4793a6f1ecaa8be846 includes.patch -5c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0 musl-compat.patch -efce71c7cc550e79c02e886af7b0130dfbdac1b46061d7dca5f0f5a5c39ef46dd0f9ff9e4c33cf2a827e498e7b8c67f0e8c916f7e3097a386e4573e6ca9732c4 0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch" +5c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0 musl-compat.patch" |