sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#22526: use newer config.guess & config.sub in depends

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-05-03 19:51:45 +08:00 committed by PastaPastaPasta
parent f16a29a864
commit 6751b13f38
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/install_db4.sh
View File

@ -221,10 +221,10 @@ EOF
# The packaged config.guess and config.sub are ancient (2009) and can cause build issues. # The packaged config.guess and config.sub are ancient (2009) and can cause build issues.
# Replace them with modern versions. # Replace them with modern versions.
# See https://github.com/bitcoin/bitcoin/issues/16064 # See https://github.com/bitcoin/bitcoin/issues/16064
CONFIG_GUESS_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b' CONFIG_GUESS_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=4550d2f15b3a7ce2451c1f29500b9339430c877f'
CONFIG_GUESS_HASH='2d1ff7bca773d2ec3c6217118129220fa72d8adda67c7d2bf79994b3129232c1' CONFIG_GUESS_HASH='c8f530e01840719871748a8071113435bdfdf75b74c57e78e47898edea8754ae'
CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b' CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=4550d2f15b3a7ce2451c1f29500b9339430c877f'
CONFIG_SUB_HASH='3a4befde9bcdf0fdb2763fc1bfa74e8696df94e1ad7aac8042d133c8ff1d2e32' CONFIG_SUB_HASH='3969f7d5f6967ccc6f792401b8ef3916a1d1b1d0f0de5a4e354c95addb8b800e'
rm -f "dist/config.guess" rm -f "dist/config.guess"
rm -f "dist/config.sub" rm -f "dist/config.sub"

1
depends/packages/libevent.mk
View File

@ -18,6 +18,7 @@ define $(package)_set_vars
endef endef
define $(package)_preprocess_cmds define $(package)_preprocess_cmds
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux && \
patch -p1 -i $($(package)_patch_dir)/glibc_compatibility.patch patch -p1 -i $($(package)_patch_dir)/glibc_compatibility.patch
endef endef

4
depends/packages/native_cctools.mk
View File

@ -16,6 +16,10 @@ define $(package)_set_vars
$(package)_cxx=$(clangxx_prog) $(package)_cxx=$(clangxx_prog)
endef endef
define $(package)_preprocess_cmds
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub cctools
endef
define $(package)_config_cmds define $(package)_config_cmds
$($(package)_autoconf) $($(package)_autoconf)
endef endef

4
depends/packages/sqlite.mk
View File

@ -10,6 +10,10 @@ $(package)_config_opts_linux=--with-pic
$(package)_cppflags_linux = -DSQLITE_DISABLE_LFS $(package)_cppflags_linux = -DSQLITE_DISABLE_LFS
endef endef
define $(package)_preprocess_cmds
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
endef
define $(package)_config_cmds define $(package)_config_cmds
$($(package)_autoconf) $($(package)_autoconf)
endef endef