mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-28 08:22:56 +02:00
btrfs-progs: musl-1.1.15 has pthread_tryjoin_np() now.
Get rid of the patch that replaced this with pthread_join().
This commit is contained in:
parent
7f13c6f584
commit
7986272cc0
2 changed files with 1 additions and 12 deletions
|
@ -1,11 +0,0 @@
|
||||||
--- chunk-recover.c.orig
|
|
||||||
+++ chunk-recover.c
|
|
||||||
@@ -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;
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'btrfs-progs'
|
# Template file for 'btrfs-progs'
|
||||||
pkgname=btrfs-progs
|
pkgname=btrfs-progs
|
||||||
version=4.6
|
version=4.6
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc=${pkgname}-v${version}
|
wrksrc=${pkgname}-v${version}
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-backtrace"
|
configure_args="--disable-backtrace"
|
||||||
|
|
Loading…
Add table
Reference in a new issue