mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
Merge bitcoin/bitcoin#25738: depends: use a patch instead of sed in libxcb
8f1ff487b3df6f3e4cb53f88045a32ea4fbc0839 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 8f1ff487b3df6f3e4cb53f88045a32ea4fbc0839. Tree-SHA512: 2b6ebbe98a838d8e08e54737292b02176ff4c85a541ae1ec0c590c75e33ba92289628b88ca3144f2e214f4327515f7fd22c39687312f44183b759815c092b24f
This commit is contained in:
parent
1fae0c2bbb
commit
73d64c48a9
@ -4,6 +4,7 @@ $(package)_download_path=https://xcb.freedesktop.org/dist
|
||||
$(package)_file_name=$(package)-$($(package)_version).tar.xz
|
||||
$(package)_sha256_hash=a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34
|
||||
$(package)_dependencies=xcb_proto libXau
|
||||
$(package)_patches = remove_pthread_stubs.patch
|
||||
|
||||
define $(package)_set_vars
|
||||
$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen --without-launchd
|
||||
@ -20,7 +21,7 @@ endef
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux && \
|
||||
sed "s/pthread-stubs//" -i configure
|
||||
patch -p1 -i $($(package)_patch_dir)/remove_pthread_stubs.patch
|
||||
endef
|
||||
|
||||
define $(package)_config_cmds
|
||||
|
12
depends/patches/libxcb/remove_pthread_stubs.patch
Normal file
12
depends/patches/libxcb/remove_pthread_stubs.patch
Normal file
@ -0,0 +1,12 @@
|
||||
Remove uneeded pthread-stubs dependency
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -19695,7 +19695,7 @@ fi
|
||||
NEEDED="xau >= 0.99.2"
|
||||
case $host_os in
|
||||
linux*) ;;
|
||||
- *) NEEDED="$NEEDED pthread-stubs" ;;
|
||||
+ *) NEEDED="$NEEDED" ;;
|
||||
esac
|
||||
|
||||
pkg_failed=no
|
Loading…
Reference in New Issue
Block a user