cmake: Re-add Windows host to Guix scripts #86
Merged
Conversation
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
607f25e to
f56f5b9
Compare
ff2f574 to
dacc6f7
Compare
f56f5b9 to
995cdbe
Compare
|
Rebased. |
There was a problem hiding this comment.
I guess the this breaks a bunch of other builds? Running env SOURCES_PATH="$HOME/depends/sources" BASE_CACHE="$HOME/depends/base_cache" JOBS="1" ./contrib/guix/guix-build:
[ 76%] Building CXX object src/qt/CMakeFiles/bitcoin-qt.dir/bitcoin/depends/x86_64-linux-gnu/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin_Import.cpp.o
[ 77%] Linking CXX executable bitcoin-qt
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/Scrt1.o: in function `_start':
/tmp/guix-build-glibc-cross-x86_64-linux-gnu-2.27.drv-0/source/csu/../sysdeps/x86_64/start.S:101: undefined reference to `__libc_csu_fini'
x86_64-linux-gnu-ld: /tmp/guix-build-glibc-cross-x86_64-linux-gnu-2.27.drv-0/source/csu/../sysdeps/x86_64/start.S:102: undefined reference to `__libc_csu_init'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_dlopen_mode@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_current_sigrtmin_private@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_dlclose@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /home/drgrid/.guix-profile/lib/libdl.so: undefined reference to `_dl_sym@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_longjmp@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_vfork@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_allocate_rtsig_private@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_thread_freeres@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_dlsym@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_current_sigrtmax_private@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /home/drgrid/.guix-profile/lib/libdl.so: undefined reference to `_dl_addr@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /home/drgrid/.guix-profile/lib/libdl.so: undefined reference to `_dl_vsym@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `__libc_pthread_init@GLIBC_PRIVATE'
x86_64-linux-gnu-ld: /gnu/store/l5kz06mbsyfc3gxmk94ryk13ifb4plqq-glibc-cross-x86_64-linux-gnu-2.27/lib/libpthread.so.0: undefined reference to `_dl_make_stack_executable@GLIBC_PRIVATE'
collect2: error: ld returned 1 exit status
make[2]: *** [src/qt/CMakeFiles/bitcoin-qt.dir/build.make:216: src/qt/bitcoin-qt] Error 1
995cdbe to
6a1b26b
Compare
|
Rebased on top of the #88, which fixes #86 (review). |
6a1b26b to
f434d91
Compare
hebasto
added a commit
that referenced
this pull request
Feb 1, 2024
6ed7dd1 fixup! cmake: Migrate Guix build scripts to CMake (Hennadii Stepanov) fe20cc0 fixup! cmake: Add `Maintenance` module (Hennadii Stepanov) f18ec5b fixup! build: Generate `share/toolchain.cmake` in depends (Hennadii Stepanov) Pull request description: Resolves the #86 (review). ACKs for top commit: TheCharlatan: ACK 6ed7dd1 Tree-SHA512: f586dfd596ced98e28b4d152f28a05ce722805e3565782b024d665d4a43155cc77ea392063b6c27916b64993aca7141d723e773de314a72149023ea6187b8597
Add `deploy` target for MINGW builds
Enable Windows build.
f434d91 to
592abd1
Compare
|
Rebased and undrafted. |
|
My Guix build: |
|
Guix build (x86 and aarch64): |
hebasto
pushed a commit
that referenced
this pull request
Jul 26, 2025
c40dbbb test: Move `script_assets_tests` into its own suite (Hennadii Stepanov) Pull request description: This PR ensures that the `script_assets_tests` test case is explicitly reported as "Skipped" when it is not run, making it clearer when running the test suite with `ctest`: - on the master branch @ 9355578: ``` $ env -u DIR_UNIT_TEST_DATA ctest --test-dir build -j 16 -R "^script_" Internal ctest changing into directory: /home/hebasto/git/bitcoin/build Test project /home/hebasto/git/bitcoin/build Start 87: script_tests Start 83: script_p2sh_tests Start 85: script_segwit_tests Start 86: script_standard_tests Start 84: script_parse_tests 1/5 Test #84: script_parse_tests ............... Passed 0.11 sec 2/5 Test #86: script_standard_tests ............ Passed 0.11 sec 3/5 Test #85: script_segwit_tests .............. Passed 0.12 sec 4/5 Test #83: script_p2sh_tests ................ Passed 0.12 sec 5/5 Test #87: script_tests ..................... Passed 0.36 sec 100% tests passed, 0 tests failed out of 5 Total Test time (real) = 0.37 sec ``` - with this PR: ``` $ env -u DIR_UNIT_TEST_DATA ctest --test-dir build -j 16 -R "^script_" Internal ctest changing into directory: /home/hebasto/git/bitcoin/build Test project /home/hebasto/git/bitcoin/build Start 83: script_assets_tests Start 88: script_tests Start 84: script_p2sh_tests Start 86: script_segwit_tests Start 87: script_standard_tests Start 85: script_parse_tests 1/6 Test #85: script_parse_tests ............... Passed 0.11 sec 2/6 Test #83: script_assets_tests ..............***Skipped 0.12 sec 3/6 Test #86: script_segwit_tests .............. Passed 0.11 sec 4/6 Test #87: script_standard_tests ............ Passed 0.11 sec 5/6 Test #84: script_p2sh_tests ................ Passed 0.12 sec 6/6 Test #88: script_tests ..................... Passed 0.36 sec 100% tests passed, 0 tests failed out of 6 Total Test time (real) = 0.37 sec The following tests did not run: 83 - script_assets_tests (Skipped) $ env DIR_UNIT_TEST_DATA=/home/hebasto/git/bitcoin/qa-assets/unit_test_data ctest --test-dir build -j 16 -R "^script_" Internal ctest changing into directory: /home/hebasto/git/bitcoin/build Test project /home/hebasto/git/bitcoin/build Start 83: script_assets_tests Start 88: script_tests Start 84: script_p2sh_tests Start 86: script_segwit_tests Start 87: script_standard_tests Start 85: script_parse_tests 1/6 Test #85: script_parse_tests ............... Passed 0.11 sec 2/6 Test #87: script_standard_tests ............ Passed 0.11 sec 3/6 Test #86: script_segwit_tests .............. Passed 0.11 sec 4/6 Test #84: script_p2sh_tests ................ Passed 0.12 sec 5/6 Test #88: script_tests ..................... Passed 0.35 sec 6/6 Test #83: script_assets_tests .............. Passed 1.58 sec 100% tests passed, 0 tests failed out of 6 Total Test time (real) = 1.58 sec ``` ACKs for top commit: maflcko: re-ACK c40dbbb 👈 ajtowns: ACK c40dbbb achow101: ACK c40dbbb Tree-SHA512: 25713e1c3b507b6f2a5fecc7b1ea285a6642b906c248769238a58fc0df48489ac5f7606778f9e3653b407b7f1d06563e1554d04321303b350c80eb888500cc5d
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The Windows installer produced by the
deploytarget is named nowbitcoin-win64-setup.exe, which differs from the master branch where it isbitcoin-<VERSION>-win64-setup.exe. I think, it is more consistent as other build artifacts do not have versioned names.Guix build: