From bda0b637b2d7ac343329c6a499b4c7b02541328d Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 3 May 2021 19:51:45 +0800
Subject: [PATCH 1/4] depends: use latest config.guess and config.sub for
 libevent

---
 depends/packages/libevent.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index dad317193c..0af5412d94 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -16,6 +16,10 @@ define $(package)_set_vars
   $(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0601
 endef
 
+define $(package)_preprocess_cmds
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux
+endef
+
 define $(package)_config_cmds
   $($(package)_autoconf)
 endef

From 35d082c5002e79e5f31412d39b6b22901ddff5a4 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 3 May 2021 20:51:35 +0800
Subject: [PATCH 2/4] depends: use latest config.guess and config.sub for
 cctools

---
 depends/packages/native_cctools.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/depends/packages/native_cctools.mk b/depends/packages/native_cctools.mk
index 885207fce9..d169eb6723 100644
--- a/depends/packages/native_cctools.mk
+++ b/depends/packages/native_cctools.mk
@@ -16,6 +16,10 @@ define $(package)_set_vars
   $(package)_cxx=$(clangxx_prog)
 endef
 
+define $(package)_preprocess_cmds
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub cctools
+endef
+
 define $(package)_config_cmds
   $($(package)_autoconf)
 endef

From 5985f098eaa3f9eff0b2fd580a0ef51e8aebc4e0 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 3 May 2021 21:01:34 +0800
Subject: [PATCH 3/4] depends: use latest config.guess and config.sub for
 sqlite

---
 depends/packages/sqlite.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/depends/packages/sqlite.mk b/depends/packages/sqlite.mk
index 5b3a61b239..af5e0d09c9 100644
--- a/depends/packages/sqlite.mk
+++ b/depends/packages/sqlite.mk
@@ -9,6 +9,10 @@ $(package)_config_opts=--disable-shared --disable-readline --disable-dynamic-ext
 $(package)_config_opts_linux=--with-pic
 endef
 
+define $(package)_preprocess_cmds
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
+endef
+
 define $(package)_config_cmds
   $($(package)_autoconf)
 endef

From 9b9da92e2a6c67e7df2b190bfd6a3fb58d794f0c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 22 Jul 2021 14:49:21 +0800
Subject: [PATCH 4/4] contrib: use newer config.guess & config.sub in
 install_db4.sh

---
 contrib/install_db4.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/install_db4.sh b/contrib/install_db4.sh
index 4037936404..dd4d862dee 100755
--- a/contrib/install_db4.sh
+++ b/contrib/install_db4.sh
@@ -221,10 +221,10 @@ EOF
 # The packaged config.guess and config.sub are ancient (2009) and can cause build issues.
 # Replace them with modern versions.
 # 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_HASH='2d1ff7bca773d2ec3c6217118129220fa72d8adda67c7d2bf79994b3129232c1'
-CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b'
-CONFIG_SUB_HASH='3a4befde9bcdf0fdb2763fc1bfa74e8696df94e1ad7aac8042d133c8ff1d2e32'
+CONFIG_GUESS_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=4550d2f15b3a7ce2451c1f29500b9339430c877f'
+CONFIG_GUESS_HASH='c8f530e01840719871748a8071113435bdfdf75b74c57e78e47898edea8754ae'
+CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=4550d2f15b3a7ce2451c1f29500b9339430c877f'
+CONFIG_SUB_HASH='3969f7d5f6967ccc6f792401b8ef3916a1d1b1d0f0de5a4e354c95addb8b800e'
 
 rm -f "dist/config.guess"
 rm -f "dist/config.sub"