mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-04 07:07:45 +01:00
Merge bitcoin/bitcoin#26421: build: copy config.{guess,sub} post autogen in zmq package
1914e470e3
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: ACK1914e470e3
, tested on Ubuntu 18.04. Tree-SHA512: dff64c3c62d9f8fc205e5a4dffe8befd58838418d073a15dfe304a0f64b182dfffd9dcf98b53df44bfab905c12a62d03cd5c0f91fa7c4b246ac21ae5f20540fd
This commit is contained in:
commit
fe86616bb4
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue