diff options
author | fanquake <fanquake@gmail.com> | 2022-08-04 08:23:24 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2022-08-04 08:28:13 +0100 |
commit | 08085c764dbfa56f90a8221bdef9434971dbb02b (patch) | |
tree | 81e6830b659c7ade6a57275292cd1e2cf4d557f8 /depends/packages | |
parent | 4a4289e2c98cfbc51b05716f21065838afed80f6 (diff) | |
parent | 7f73f422a49f5a85c71f645721be5afc045a6dee (diff) | |
download | bitcoin-08085c764dbfa56f90a8221bdef9434971dbb02b.tar.xz |
Merge bitcoin/bitcoin#25633: depends: don't restrict --enable-lto to non-guix cctools
7f73f422a49f5a85c71f645721be5afc045a6dee depends: don't restrict --enable-lto to non-guix cctools (fanquake)
9b60690b94ca766f8039a7a7a20dda5fecd176ab cctools: fixup building with LTO (fanquake)
Pull request description:
This wasn't actually disabling LTO support anyways, because it's enabled
by default.
Guix Build (x86_64):
```bash
af6e0b5fd494f714a84716161352aee415700c1f50f1f08665a474dc2ed56bad guix-build-7f73f422a49f/output/aarch64-linux-gnu/SHA256SUMS.part
1ecdbf2b579204cf2086001df3887da2ba50cd3f7b8f735113cce8f1b634fdb2 guix-build-7f73f422a49f/output/aarch64-linux-gnu/bitcoin-7f73f422a49f-aarch64-linux-gnu-debug.tar.gz
878ea08855dc559e62fd1932f8a54d53fc63e0ce7d587345c7326892622feee9 guix-build-7f73f422a49f/output/aarch64-linux-gnu/bitcoin-7f73f422a49f-aarch64-linux-gnu.tar.gz
4d1d35bd329935bc74b82a78a7fb8dd39c3268d4bbb33ecd877079e49de97a88 guix-build-7f73f422a49f/output/arm-linux-gnueabihf/SHA256SUMS.part
c0c5418dc270d716b354d2190fddde3d25794758dee45c9068e9f5aac20e5617 guix-build-7f73f422a49f/output/arm-linux-gnueabihf/bitcoin-7f73f422a49f-arm-linux-gnueabihf-debug.tar.gz
5e13ac8cacf1042746eef7e85695469c50d6afc06dfdb5da53039175e5185b52 guix-build-7f73f422a49f/output/arm-linux-gnueabihf/bitcoin-7f73f422a49f-arm-linux-gnueabihf.tar.gz
218b2463a07503e77711fcf0245bc642eb9ed76e4a3e8b61d66a5c76bdc25c62 guix-build-7f73f422a49f/output/arm64-apple-darwin/SHA256SUMS.part
dd15af2b7a333f3c4b3f75abd307e1789a1629728a0ae33d8a509478ace91134 guix-build-7f73f422a49f/output/arm64-apple-darwin/bitcoin-7f73f422a49f-arm64-apple-darwin-unsigned.dmg
5cdfd9fc347007890991c68746b1bb36e0cced57fee685337b3d079d498f687d guix-build-7f73f422a49f/output/arm64-apple-darwin/bitcoin-7f73f422a49f-arm64-apple-darwin-unsigned.tar.gz
80f957e78177927ace323ea90d4bad2e8d2b846b199a0dcb085c3ceae8516631 guix-build-7f73f422a49f/output/arm64-apple-darwin/bitcoin-7f73f422a49f-arm64-apple-darwin.tar.gz
3cb9cb04db3ebf328bfabfda874fce09764f3840c98bd850d85f71892617fb99 guix-build-7f73f422a49f/output/dist-archive/bitcoin-7f73f422a49f.tar.gz
e4e7c9d5366b658fc420c1fd3cf12bfb9863b8061c83b06fe2492e934bb75ae9 guix-build-7f73f422a49f/output/powerpc64-linux-gnu/SHA256SUMS.part
da4ea7dd9a131901ff2f7fcd6eba573fe946ea671ae6ada418a4ceebcc4bd3b6 guix-build-7f73f422a49f/output/powerpc64-linux-gnu/bitcoin-7f73f422a49f-powerpc64-linux-gnu-debug.tar.gz
221f6e1d5193207eed400c186c8f83747fbf90c3244cd044b36acadbed0c83a6 guix-build-7f73f422a49f/output/powerpc64-linux-gnu/bitcoin-7f73f422a49f-powerpc64-linux-gnu.tar.gz
12d36079b330ec75209219ce58ca580ca5a5eeac64fb7ae424c64e7f3d466ee5 guix-build-7f73f422a49f/output/powerpc64le-linux-gnu/SHA256SUMS.part
3cef0194569d6fa968e92be1d2189be4f1337272dc213c25b8d4afe6b174310c guix-build-7f73f422a49f/output/powerpc64le-linux-gnu/bitcoin-7f73f422a49f-powerpc64le-linux-gnu-debug.tar.gz
a8ff109153926b3240f830c3501977046b6c470b67380a01c55aea2401a1a833 guix-build-7f73f422a49f/output/powerpc64le-linux-gnu/bitcoin-7f73f422a49f-powerpc64le-linux-gnu.tar.gz
70b3a841bb232fefe27f857ee826ea6a84f59bc781acda608bd6d9385a1ef149 guix-build-7f73f422a49f/output/riscv64-linux-gnu/SHA256SUMS.part
841a276263877027f256c3b7ad1c5bc3ae3ad4d6a7157690daa947f6809776e2 guix-build-7f73f422a49f/output/riscv64-linux-gnu/bitcoin-7f73f422a49f-riscv64-linux-gnu-debug.tar.gz
6cce2c36c2a53035d7ee5d285c8b4b99256772c7a9dca1739f0639ecc0bed71d guix-build-7f73f422a49f/output/riscv64-linux-gnu/bitcoin-7f73f422a49f-riscv64-linux-gnu.tar.gz
e910b32efebca682cf8bc3994d2c7513b16cdeb6f94cef906efb6629ec53268d guix-build-7f73f422a49f/output/x86_64-apple-darwin/SHA256SUMS.part
3a4bc1573d9c576184d69b953ea6a85650d4e15b71503b909ccd4fb8a69ca383 guix-build-7f73f422a49f/output/x86_64-apple-darwin/bitcoin-7f73f422a49f-x86_64-apple-darwin-unsigned.dmg
60a114ece1d9a274d9f3d80a9633eb22d589213ba53a956f3b1138d7c8f55560 guix-build-7f73f422a49f/output/x86_64-apple-darwin/bitcoin-7f73f422a49f-x86_64-apple-darwin-unsigned.tar.gz
b6c6eca3e81bfadfed3ddcb7830857c954c8a7b0ff458f14050f4952240ebf27 guix-build-7f73f422a49f/output/x86_64-apple-darwin/bitcoin-7f73f422a49f-x86_64-apple-darwin.tar.gz
aab972c6f051c379a20eb694128a4df4e3737758fbca3902d28d72cd93e6d33a guix-build-7f73f422a49f/output/x86_64-linux-gnu/SHA256SUMS.part
b8e643eeb72cf04664462f815497cbef1443f2e113de14bc93b058d83836c7df guix-build-7f73f422a49f/output/x86_64-linux-gnu/bitcoin-7f73f422a49f-x86_64-linux-gnu-debug.tar.gz
3b40fb5f1341cc3b49c9eccc68fc75e1cc7e7d2c6a5664fa2f8f095290e3733a guix-build-7f73f422a49f/output/x86_64-linux-gnu/bitcoin-7f73f422a49f-x86_64-linux-gnu.tar.gz
96138d5f591a8ba8589eb81d2c79ee269556996ae93c6a3fc77746e101b60cab guix-build-7f73f422a49f/output/x86_64-w64-mingw32/SHA256SUMS.part
6ef2d9436caa550bec7defda1d769bffc2e0fe8f7acf99e2fbcefd2e9b920a64 guix-build-7f73f422a49f/output/x86_64-w64-mingw32/bitcoin-7f73f422a49f-win64-debug.zip
91c8c3f0aec623f4183c4ebc141816dddb4482509e99812d32298f3e83da920f guix-build-7f73f422a49f/output/x86_64-w64-mingw32/bitcoin-7f73f422a49f-win64-setup-unsigned.exe
1de7cd32d74990cfcd4e00428c53a35742b7a480f18ae1bd60dbf91b60400947 guix-build-7f73f422a49f/output/x86_64-w64-mingw32/bitcoin-7f73f422a49f-win64-unsigned.tar.gz
e4d4ba33bbdd8d9181c8422af31ad6127f3627c327a93cbe8245d7154b5a936c guix-build-7f73f422a49f/output/x86_64-w64-mingw32/bitcoin-7f73f422a49f-win64.zip
```
Guix Build (arm64):
```bash
4d1d35bd329935bc74b82a78a7fb8dd39c3268d4bbb33ecd877079e49de97a88 guix-build-7f73f422a49f/output/arm-linux-gnueabihf/SHA256SUMS.part
c0c5418dc270d716b354d2190fddde3d25794758dee45c9068e9f5aac20e5617 guix-build-7f73f422a49f/output/arm-linux-gnueabihf/bitcoin-7f73f422a49f-arm-linux-gnueabihf-debug.tar.gz
5e13ac8cacf1042746eef7e85695469c50d6afc06dfdb5da53039175e5185b52 guix-build-7f73f422a49f/output/arm-linux-gnueabihf/bitcoin-7f73f422a49f-arm-linux-gnueabihf.tar.gz
5768bc05947954f8d0caa1869edbba7a9102339d43c47a43cbc5eabdabebfd16 guix-build-7f73f422a49f/output/arm64-apple-darwin/SHA256SUMS.part
e506d3a635364751eaeccf553bd8c8847e5a2ab4a28bb03108052ae697b49e7e guix-build-7f73f422a49f/output/arm64-apple-darwin/bitcoin-7f73f422a49f-arm64-apple-darwin-unsigned.dmg
76fd8b6954ead8bbbba56fbf747459019dcd2def22ab6615ce817f2fff7adcb8 guix-build-7f73f422a49f/output/arm64-apple-darwin/bitcoin-7f73f422a49f-arm64-apple-darwin-unsigned.tar.gz
f369a59d44cd31a505faf1eefd84b9ecde91f4cb036e79d38188c9ed0f9c094c guix-build-7f73f422a49f/output/arm64-apple-darwin/bitcoin-7f73f422a49f-arm64-apple-darwin.tar.gz
3cb9cb04db3ebf328bfabfda874fce09764f3840c98bd850d85f71892617fb99 guix-build-7f73f422a49f/output/dist-archive/bitcoin-7f73f422a49f.tar.gz
e4e7c9d5366b658fc420c1fd3cf12bfb9863b8061c83b06fe2492e934bb75ae9 guix-build-7f73f422a49f/output/powerpc64-linux-gnu/SHA256SUMS.part
da4ea7dd9a131901ff2f7fcd6eba573fe946ea671ae6ada418a4ceebcc4bd3b6 guix-build-7f73f422a49f/output/powerpc64-linux-gnu/bitcoin-7f73f422a49f-powerpc64-linux-gnu-debug.tar.gz
221f6e1d5193207eed400c186c8f83747fbf90c3244cd044b36acadbed0c83a6 guix-build-7f73f422a49f/output/powerpc64-linux-gnu/bitcoin-7f73f422a49f-powerpc64-linux-gnu.tar.gz
12d36079b330ec75209219ce58ca580ca5a5eeac64fb7ae424c64e7f3d466ee5 guix-build-7f73f422a49f/output/powerpc64le-linux-gnu/SHA256SUMS.part
3cef0194569d6fa968e92be1d2189be4f1337272dc213c25b8d4afe6b174310c guix-build-7f73f422a49f/output/powerpc64le-linux-gnu/bitcoin-7f73f422a49f-powerpc64le-linux-gnu-debug.tar.gz
a8ff109153926b3240f830c3501977046b6c470b67380a01c55aea2401a1a833 guix-build-7f73f422a49f/output/powerpc64le-linux-gnu/bitcoin-7f73f422a49f-powerpc64le-linux-gnu.tar.gz
70b3a841bb232fefe27f857ee826ea6a84f59bc781acda608bd6d9385a1ef149 guix-build-7f73f422a49f/output/riscv64-linux-gnu/SHA256SUMS.part
841a276263877027f256c3b7ad1c5bc3ae3ad4d6a7157690daa947f6809776e2 guix-build-7f73f422a49f/output/riscv64-linux-gnu/bitcoin-7f73f422a49f-riscv64-linux-gnu-debug.tar.gz
6cce2c36c2a53035d7ee5d285c8b4b99256772c7a9dca1739f0639ecc0bed71d guix-build-7f73f422a49f/output/riscv64-linux-gnu/bitcoin-7f73f422a49f-riscv64-linux-gnu.tar.gz
e910b32efebca682cf8bc3994d2c7513b16cdeb6f94cef906efb6629ec53268d guix-build-7f73f422a49f/output/x86_64-apple-darwin/SHA256SUMS.part
3a4bc1573d9c576184d69b953ea6a85650d4e15b71503b909ccd4fb8a69ca383 guix-build-7f73f422a49f/output/x86_64-apple-darwin/bitcoin-7f73f422a49f-x86_64-apple-darwin-unsigned.dmg
60a114ece1d9a274d9f3d80a9633eb22d589213ba53a956f3b1138d7c8f55560 guix-build-7f73f422a49f/output/x86_64-apple-darwin/bitcoin-7f73f422a49f-x86_64-apple-darwin-unsigned.tar.gz
b6c6eca3e81bfadfed3ddcb7830857c954c8a7b0ff458f14050f4952240ebf27 guix-build-7f73f422a49f/output/x86_64-apple-darwin/bitcoin-7f73f422a49f-x86_64-apple-darwin.tar.gz
aab972c6f051c379a20eb694128a4df4e3737758fbca3902d28d72cd93e6d33a guix-build-7f73f422a49f/output/x86_64-linux-gnu/SHA256SUMS.part
b8e643eeb72cf04664462f815497cbef1443f2e113de14bc93b058d83836c7df guix-build-7f73f422a49f/output/x86_64-linux-gnu/bitcoin-7f73f422a49f-x86_64-linux-gnu-debug.tar.gz
3b40fb5f1341cc3b49c9eccc68fc75e1cc7e7d2c6a5664fa2f8f095290e3733a guix-build-7f73f422a49f/output/x86_64-linux-gnu/bitcoin-7f73f422a49f-x86_64-linux-gnu.tar.gz
96138d5f591a8ba8589eb81d2c79ee269556996ae93c6a3fc77746e101b60cab guix-build-7f73f422a49f/output/x86_64-w64-mingw32/SHA256SUMS.part
6ef2d9436caa550bec7defda1d769bffc2e0fe8f7acf99e2fbcefd2e9b920a64 guix-build-7f73f422a49f/output/x86_64-w64-mingw32/bitcoin-7f73f422a49f-win64-debug.zip
91c8c3f0aec623f4183c4ebc141816dddb4482509e99812d32298f3e83da920f guix-build-7f73f422a49f/output/x86_64-w64-mingw32/bitcoin-7f73f422a49f-win64-setup-unsigned.exe
1de7cd32d74990cfcd4e00428c53a35742b7a480f18ae1bd60dbf91b60400947 guix-build-7f73f422a49f/output/x86_64-w64-mingw32/bitcoin-7f73f422a49f-win64-unsigned.tar.gz
e4d4ba33bbdd8d9181c8422af31ad6127f3627c327a93cbe8245d7154b5a936c guix-build-7f73f422a49f/output/x86_64-w64-mingw32/bitcoin-7f73f422a49f-win64.zip
```
ACKs for top commit:
hebasto:
ACK 7f73f422a49f5a85c71f645721be5afc045a6dee
Tree-SHA512: 8e49bed15b9f92e9905a004c01134ebcef9d7e006c96a8bab1606b1af8a20d495e3aa9846344bac5169fee86fa611dc660cf0bd04dd07f393e5e3f1b12ad4a01
Diffstat (limited to 'depends/packages')
-rw-r--r-- | depends/packages/native_cctools.mk | 14 | ||||
-rw-r--r-- | depends/packages/native_clang.mk | 3 | ||||
-rw-r--r-- | depends/packages/native_libtapi.mk | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/depends/packages/native_cctools.mk b/depends/packages/native_cctools.mk index d169eb6723..03e9002ecd 100644 --- a/depends/packages/native_cctools.mk +++ b/depends/packages/native_cctools.mk @@ -7,18 +7,24 @@ $(package)_build_subdir=cctools $(package)_dependencies=native_libtapi define $(package)_set_vars - $(package)_config_opts=--target=$(host) + $(package)_config_opts=--target=$(host) --enable-lto-support + $(package)_config_opts+=--with-llvm-config=$(llvm_config_prog) $(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib - ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),) - $(package)_config_opts+=--enable-lto-support --with-llvm-config=$(build_prefix)/bin/llvm-config - endif $(package)_cc=$(clang_prog) $(package)_cxx=$(clangxx_prog) endef +ifneq ($(strip $(FORCE_USE_SYSTEM_CLANG)),) define $(package)_preprocess_cmds + mkdir -p $($(package)_staging_prefix_dir)/lib && \ + cp $(llvm_lib_dir)/libLTO.so $($(package)_staging_prefix_dir)/lib/ && \ cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub cctools endef +else +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub cctools +endef +endif define $(package)_config_cmds $($(package)_autoconf) diff --git a/depends/packages/native_clang.mk b/depends/packages/native_clang.mk index 245269a9d3..f2712294ab 100644 --- a/depends/packages/native_clang.mk +++ b/depends/packages/native_clang.mk @@ -16,10 +16,13 @@ endef define $(package)_stage_cmds mkdir -p $($(package)_staging_prefix_dir)/lib/clang/$($(package)_version)/include && \ mkdir -p $($(package)_staging_prefix_dir)/bin && \ + mkdir -p $($(package)_staging_prefix_dir)/include/llvm-c && \ cp bin/clang $($(package)_staging_prefix_dir)/bin/ && \ cp -P bin/clang++ $($(package)_staging_prefix_dir)/bin/ && \ cp bin/dsymutil $($(package)_staging_prefix_dir)/bin/$(host)-dsymutil && \ cp bin/llvm-config $($(package)_staging_prefix_dir)/bin/ && \ + cp include/llvm-c/ExternC.h $($(package)_staging_prefix_dir)/include/llvm-c && \ + cp include/llvm-c/lto.h $($(package)_staging_prefix_dir)/include/llvm-c && \ cp lib/libLTO.so $($(package)_staging_prefix_dir)/lib/ && \ cp -r lib/clang/$($(package)_version)/include/* $($(package)_staging_prefix_dir)/lib/clang/$($(package)_version)/include/ endef diff --git a/depends/packages/native_libtapi.mk b/depends/packages/native_libtapi.mk index 1633213a42..052bb23689 100644 --- a/depends/packages/native_libtapi.mk +++ b/depends/packages/native_libtapi.mk @@ -13,7 +13,5 @@ define $(package)_build_cmds endef define $(package)_stage_cmds - ./install.sh && \ - mkdir -p $($(package)_staging_prefix_dir)/include/llvm-c && \ - cp src/llvm/include/llvm-c/lto.h $($(package)_staging_prefix_dir)/include/llvm-c + ./install.sh endef |