cmake: Migrate Guix build scripts to CMake#67
Merged
Conversation
This was referenced Dec 16, 2023
hebasto
force-pushed
the
231216-cmake-AO
branch
4 times, most recently
from
6de765a to
0d9c421
Compare
hebasto
force-pushed
the
231216-cmake-AO
branch
from
0d9c421 to
27fef64
Compare
hebasto
changed the title
Owner
Author
|
Reworked according to bitcoin#29189. Friendly ping @fanquake @TheCharlatan @theuni :) |
sedited
reviewed
Jan 8, 2024
|
|
||
| add_custom_target(check-symbols | ||
| COMMAND ${CMAKE_COMMAND} -E echo "Running symbol and dynamic library checks..." | ||
| COMMAND ${PYTHON_COMMAND} ${CMAKE_SOURCE_DIR}/contrib/devtools/symbol-check.py ${executables} |
There was a problem hiding this comment.
Never mind, this file does not have to be manually added or executed, so no change required.
|
Guix builds (x86 & aarch64) |
theuni
reviewed
Jan 9, 2024
theuni
left a comment
theuni
left a comment
There was a problem hiding this comment.
Concept ACK.
Looks ok at a quick glance. Haven't tested yet.
| ${HOST_LDFLAGS:+LDFLAGS="${HOST_LDFLAGS}"} | ||
|
|
||
| sed -i.old 's/-lstdc++ //g' config.status libtool | ||
| env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \ |
There was a problem hiding this comment.
Any reason to prefer env here over setting the CMAKE variables directly?
Owner
Author
There was a problem hiding this comment.
The LDFLAGS populates both CMake variables: CMAKE_EXE_LINKER_FLAGS and CMAKE_SHARED_LINKER_FLAGS. The code is more concise.
CFLAGS and CXXFLAGS are used in the same way for consistency.
hebasto
force-pushed
the
231216-cmake-AO
branch
from
27fef64 to
54b4ab6
Compare
Owner
Author
|
Rebased. |
sedited
reviewed
Jan 9, 2024
sedited
left a comment
sedited
left a comment
There was a problem hiding this comment.
Guix build (x86)
9c6e2c3493f546f683f0dce6f139a67e5b46e746aa7347f9eb6112eef3180287 guix-build-54b4ab66e2f9/output/aarch64-linux-gnu/SHA256SUMS.part
93f1d78f882e9fb1f7b6792d7d05f6730ebaccb2be780b9a80a262e14172f4b2 guix-build-54b4ab66e2f9/output/aarch64-linux-gnu/bitcoin-54b4ab66e2f9-aarch64-linux-gnu-debug.tar.gz
c9675c78e33c2773ff7ade28001a73f54e1b459d0f6de9685ce8e417b801677d guix-build-54b4ab66e2f9/output/aarch64-linux-gnu/bitcoin-54b4ab66e2f9-aarch64-linux-gnu.tar.gz
c05e90d3163223f31133dc02339b7218cd19c7916d6977b908e6c8840f058408 guix-build-54b4ab66e2f9/output/arm-linux-gnueabihf/SHA256SUMS.part
988c7ffb3cf77fb7e2329c9474cfb211f183db1a958e89567b503d7376c25d0c guix-build-54b4ab66e2f9/output/arm-linux-gnueabihf/bitcoin-54b4ab66e2f9-arm-linux-gnueabihf-debug.tar.gz
1bcbcc4154808d55588981c793795ea6389750e90efcae0684d4bf469e86749b guix-build-54b4ab66e2f9/output/arm-linux-gnueabihf/bitcoin-54b4ab66e2f9-arm-linux-gnueabihf.tar.gz
47ac728a81c5f4e26a10ab2cc362eceac0398a3fad4a0fa295fb505ed82814b6 guix-build-54b4ab66e2f9/output/dist-archive/bitcoin-54b4ab66e2f9.tar.gz
a3bc2e70852b8a95b8334fa71e2fa4590a331dbed7a00d00fc5303a1e1c061fe guix-build-54b4ab66e2f9/output/powerpc64-linux-gnu/SHA256SUMS.part
1c0dd0f27fc600edcf8ff3a8884ae3a81616c0ea31466e0284c2b9753f2e5090 guix-build-54b4ab66e2f9/output/powerpc64-linux-gnu/bitcoin-54b4ab66e2f9-powerpc64-linux-gnu-debug.tar.gz
0eb731e7aec88fc65814e2c49314941cd6a1e75aaa05ea0cf4b22158762ab6bc guix-build-54b4ab66e2f9/output/powerpc64-linux-gnu/bitcoin-54b4ab66e2f9-powerpc64-linux-gnu.tar.gz
d46de7c6c333d5c1feb206171b2dd049ee0b48daeacbef75ef75033b488f8595 guix-build-54b4ab66e2f9/output/powerpc64le-linux-gnu/SHA256SUMS.part
be193c8d672c6000c3b798df6d75408a91dcbb5ec982f74495954970fce67e29 guix-build-54b4ab66e2f9/output/powerpc64le-linux-gnu/bitcoin-54b4ab66e2f9-powerpc64le-linux-gnu-debug.tar.gz
1fbb475ef5088810d49dd2bed13e32deb52d2dc019c2fbe35ee26c3c92b3b507 guix-build-54b4ab66e2f9/output/powerpc64le-linux-gnu/bitcoin-54b4ab66e2f9-powerpc64le-linux-gnu.tar.gz
e722583e7a44540fe8d815044c957ae4a1fc702c2085c6cdf396c1b4547c615a guix-build-54b4ab66e2f9/output/riscv64-linux-gnu/SHA256SUMS.part
9d5e6ec589a2c3e06793156dc807c49c47fdb75b945ba0b76a24d24d4ac5a880 guix-build-54b4ab66e2f9/output/riscv64-linux-gnu/bitcoin-54b4ab66e2f9-riscv64-linux-gnu-debug.tar.gz
3001824dea87f57e74b88233e611e7e8c66df1808e01cdcfa7f397fdc9cbd63c guix-build-54b4ab66e2f9/output/riscv64-linux-gnu/bitcoin-54b4ab66e2f9-riscv64-linux-gnu.tar.gz
58b5734e9f8a28fdf69102c293aca02504eaa13774ecf9c36f06e842d531d6e2 guix-build-54b4ab66e2f9/output/x86_64-linux-gnu/SHA256SUMS.part
7518e11c9031da5c8bca8e52a8a887f0561dbefd7812b25f729d68ddaf67ad19 guix-build-54b4ab66e2f9/output/x86_64-linux-gnu/bitcoin-54b4ab66e2f9-x86_64-linux-gnu-debug.tar.gz
df039c583480046ee969604511b128093a4f3267a076f5386c1a2c26ab27fa73 guix-build-54b4ab66e2f9/output/x86_64-linux-gnu/bitcoin-54b4ab66e2f9-x86_64-linux-gnu.tar.gz
Owner
Author
|
Guix build on x86_64: |
sedited
approved these changes
Jan 16, 2024
hebasto
force-pushed
the
cmake-staging
branch
from
67ceebb to
203a3ab
Compare
hebasto
force-pushed
the
231216-cmake-AO
branch
from
54b4ab6 to
3243057
Compare
Owner
Author
|
My Guix build: |
|
Mine match @hebasto's Re-ACK |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Windows and macOS hosts are disabled temporarily as they require GUI for their deploy targets.