diff options
| author | fanquake <fanquake@gmail.com> | 2023-02-07 12:00:05 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-02-07 12:01:30 +0000 |
| commit | fe86616bb4ad0c4296d34299bc2e2f0fca1fe936 (patch) | |
| tree | ff5ba2b8d93988d4afee8edc607f4f3726208301 | |
| parent | ab5b26f072a202be8b9a495ad3bc05ece00903c2 (diff) | |
| parent | 1914e470e327091c625f627b4447beb336f7fe5a (diff) | |
Merge bitcoin/bitcoin#26421: build: copy config.{guess,sub} post autogen in zmq package
1914e470e327091c625f627b4447beb336f7fe5a build: copy config.{guess,sub} post autogen in zmq package (fanquake)
Pull request description:
Otherwise our config.guess and config.sub will be copied over. This problem has been masked by the fact that modern systems ship with versions that recognise all the triplets we use (namely arm64-apple-darwin). However building on ubuntu 20.04 surfaces the issue.
Fixes #26420.
ACKs for top commit:
hebasto:
ACK 1914e470e327091c625f627b4447beb336f7fe5a, tested on Ubuntu 18.04.
Tree-SHA512: dff64c3c62d9f8fc205e5a4dffe8befd58838418d073a15dfe304a0f64b182dfffd9dcf98b53df44bfab905c12a62d03cd5c0f91fa7c4b246ac21ae5f20540fd
| -rw-r--r-- | depends/packages/zeromq.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 267ed11253..d715232793 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -20,12 +20,12 @@ endef define $(package)_preprocess_cmds patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \ - patch -p1 < $($(package)_patch_dir)/netbsd_kevent_void.patch && \ - cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub config + patch -p1 < $($(package)_patch_dir)/netbsd_kevent_void.patch endef define $(package)_config_cmds ./autogen.sh && \ + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub config && \ $($(package)_autoconf) endef |