Skip to content

Commit 6745e36

Browse files
committed
Merge bitcoin/bitcoin#25738: depends: use a patch instead of sed in libxcb
8f1ff48 libxcb: use a patch instead of sed (fanquake) Pull request description: To remove the unneeded pthread-stubs requirement. Should almost be enough to close #16838. seds dead (mostly). The usage left in `qt.mk` are for substituting runtime values. ACKs for top commit: hebasto: ACK 8f1ff48. Tree-SHA512: 2b6ebbe98a838d8e08e54737292b02176ff4c85a541ae1ec0c590c75e33ba92289628b88ca3144f2e214f4327515f7fd22c39687312f44183b759815c092b24f
2 parents ab3db34 + 8f1ff48 commit 6745e36

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

depends/packages/libxcb.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ $(package)_download_path=https://xcb.freedesktop.org/dist
44
$(package)_file_name=$(package)-$($(package)_version).tar.xz
55
$(package)_sha256_hash=a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34
66
$(package)_dependencies=xcb_proto libXau
7+
$(package)_patches = remove_pthread_stubs.patch
78

89
define $(package)_set_vars
910
$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen --without-launchd
@@ -20,7 +21,7 @@ endef
2021

2122
define $(package)_preprocess_cmds
2223
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux && \
23-
sed "s/pthread-stubs//" -i configure
24+
patch -p1 -i $($(package)_patch_dir)/remove_pthread_stubs.patch
2425
endef
2526

2627
define $(package)_config_cmds
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Remove uneeded pthread-stubs dependency
2+
--- a/configure
3+
+++ b/configure
4+
@@ -19695,7 +19695,7 @@ fi
5+
NEEDED="xau >= 0.99.2"
6+
case $host_os in
7+
linux*) ;;
8+
- *) NEEDED="$NEEDED pthread-stubs" ;;
9+
+ *) NEEDED="$NEEDED" ;;
10+
esac
11+
12+
pkg_failed=no

0 commit comments

Comments
 (0)