Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jan 4, 2022

In favour of checking $host_os and $build_os directly.

Guix Build (on x86_64):

68028f87229f37c1db16968cc7f573960e0b8807c907fcc2682224c318eed2ac  guix-build-86851c8e9424/output/aarch64-linux-gnu/SHA256SUMS.part
7eff4657c22ed71181286b753a65a5a4886a0e3ec3990dcd74961c0a5d33e9e0  guix-build-86851c8e9424/output/aarch64-linux-gnu/bitcoin-86851c8e9424-aarch64-linux-gnu-debug.tar.gz
5256ae19e65d9457862b37b68a7f12841c982822d21a03e3f45d0e461a3d3764  guix-build-86851c8e9424/output/aarch64-linux-gnu/bitcoin-86851c8e9424-aarch64-linux-gnu.tar.gz
15908fd7744342c66995d93a15cf08f27588dcf13bb199ce44d7805f50139161  guix-build-86851c8e9424/output/arm-linux-gnueabihf/SHA256SUMS.part
a77f6a0c53b664bdf7a5bd93bd9b7f983a7e9062d85ccae51c6828ccc88ed446  guix-build-86851c8e9424/output/arm-linux-gnueabihf/bitcoin-86851c8e9424-arm-linux-gnueabihf-debug.tar.gz
169d67890877bf9609ad0ac9d04d0651d6b3cb75b112c798f9bc9ac21c99a75b  guix-build-86851c8e9424/output/arm-linux-gnueabihf/bitcoin-86851c8e9424-arm-linux-gnueabihf.tar.gz
c3ef7422d577a34e23ac662dfe6269d7a8aa549cb723375f6e963ead3e2872a3  guix-build-86851c8e9424/output/arm64-apple-darwin/SHA256SUMS.part
a5dd82e4b151898473607b9796529f9e2021d252072b2c0321ddc87706f1ffde  guix-build-86851c8e9424/output/arm64-apple-darwin/bitcoin-86851c8e9424-arm64-apple-darwin-unsigned.dmg
75a8ff020808bbd3faad40c0760f1fef5bf30749e49f047ba13f9f43b9b09c9b  guix-build-86851c8e9424/output/arm64-apple-darwin/bitcoin-86851c8e9424-arm64-apple-darwin-unsigned.tar.gz
c7a0bd10d368be1373b105fab4eca2884a869def0e20d86f3e685a45a7759de9  guix-build-86851c8e9424/output/arm64-apple-darwin/bitcoin-86851c8e9424-arm64-apple-darwin.tar.gz
7fec22ad8ad1b9f6ec0014685ec46db216ae2c38040b2d9b02b6afbe0b726f8d  guix-build-86851c8e9424/output/dist-archive/bitcoin-86851c8e9424.tar.gz
6ad7faff882399eee3d9943fcaaabdae343cbf9e57e6bdd07af5a575735692ee  guix-build-86851c8e9424/output/powerpc64-linux-gnu/SHA256SUMS.part
2f39d53f910340bfb530f55d20c3658a2f4ff6ff854498c4ee81f4448f56595e  guix-build-86851c8e9424/output/powerpc64-linux-gnu/bitcoin-86851c8e9424-powerpc64-linux-gnu-debug.tar.gz
85071756fe637f1e69f68672b946ffd846cd2d940c3ff16e43710fb6cd8eb855  guix-build-86851c8e9424/output/powerpc64-linux-gnu/bitcoin-86851c8e9424-powerpc64-linux-gnu.tar.gz
99faa6d2cf4494ce04de65394a42e915739327fefbb474d162827988d41db97f  guix-build-86851c8e9424/output/powerpc64le-linux-gnu/SHA256SUMS.part
60e047bcfe417966a015b053c2ed866b072d2b2805dde8c9a34233fa2afc03bf  guix-build-86851c8e9424/output/powerpc64le-linux-gnu/bitcoin-86851c8e9424-powerpc64le-linux-gnu-debug.tar.gz
886d223badad0450516de403e308d550ea298ff240a2db5e1064d08f38af7a62  guix-build-86851c8e9424/output/powerpc64le-linux-gnu/bitcoin-86851c8e9424-powerpc64le-linux-gnu.tar.gz
02b68f0182a69f10e0b84438bba6fa4622a1e4f3d2eca9b9600caf3e8107b7ad  guix-build-86851c8e9424/output/riscv64-linux-gnu/SHA256SUMS.part
9a7121ad57093b5134c836367fd0f333b859e460374c5b3f5bcd50754d46b5ff  guix-build-86851c8e9424/output/riscv64-linux-gnu/bitcoin-86851c8e9424-riscv64-linux-gnu-debug.tar.gz
fbb814a427b5312063f1e136ad53728709e93647d62d927b200fe20e8794a8c4  guix-build-86851c8e9424/output/riscv64-linux-gnu/bitcoin-86851c8e9424-riscv64-linux-gnu.tar.gz
4b2b297264d1b18f574970b413571452e57ea2b7734b2e19b798db0651827dc5  guix-build-86851c8e9424/output/x86_64-apple-darwin/SHA256SUMS.part
db4e7273328d8a6643c4c96a1aef17b40e0e798ff42c4c68b8cea313d099f314  guix-build-86851c8e9424/output/x86_64-apple-darwin/bitcoin-86851c8e9424-x86_64-apple-darwin-unsigned.dmg
88835ac28bc88fa3f454ff771c18a6df18605cb046aa82f1e77e3e838d92a7cd  guix-build-86851c8e9424/output/x86_64-apple-darwin/bitcoin-86851c8e9424-x86_64-apple-darwin-unsigned.tar.gz
3b85604d469a18966743ef4d4711a800f1cd8ebba7cdc8d949348a60f5851815  guix-build-86851c8e9424/output/x86_64-apple-darwin/bitcoin-86851c8e9424-x86_64-apple-darwin.tar.gz
90850966a4c7a8fd44b14a95b29e6aaf5931ff00e78abe1623d79ac1d77a95ba  guix-build-86851c8e9424/output/x86_64-linux-gnu/SHA256SUMS.part
f960bfb2a7f2617aa530e96b03bda3ba89b4b39b4c6b1ff99bf2dbec2f6bcbcf  guix-build-86851c8e9424/output/x86_64-linux-gnu/bitcoin-86851c8e9424-x86_64-linux-gnu-debug.tar.gz
45bdb6ce51d9805f1ac6f11b7d61c4e8ef3c03afd2237904c16efefbd9130ba2  guix-build-86851c8e9424/output/x86_64-linux-gnu/bitcoin-86851c8e9424-x86_64-linux-gnu.tar.gz
2533b66a1fc86e36f371ce756c3c91b012cb8cf45c24fe8d06a0ffdaf44fdc79  guix-build-86851c8e9424/output/x86_64-w64-mingw32/SHA256SUMS.part
1666ce76ea847707932eed14eb9ac7ed9a64a86e33a5458a505e1ff7cf718d31  guix-build-86851c8e9424/output/x86_64-w64-mingw32/bitcoin-86851c8e9424-win64-debug.zip
21a18fa4eeaab9c3284894b2c4870ec1516cd5d013ef6580f9b2e60e1c0524a4  guix-build-86851c8e9424/output/x86_64-w64-mingw32/bitcoin-86851c8e9424-win64-setup-unsigned.exe
130d005feaf0e16928c5f7c10bc9d87cc3d713e7310ffdb5fcf633d6e017cfd5  guix-build-86851c8e9424/output/x86_64-w64-mingw32/bitcoin-86851c8e9424-win64-unsigned.tar.gz
1c0e77afa23541dccf27a850e00d8ecade82c95c70a58bb09499e43a61e48d44  guix-build-86851c8e9424/output/x86_64-w64-mingw32/bitcoin-86851c8e9424-win64.zip

@hebasto
Copy link
Member

hebasto commented Jan 4, 2022

Concept ACK.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jan 4, 2022

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #24798 ([POC] build: Hello Qt 6 by hebasto)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@fanquake
Copy link
Member Author

fanquake commented Jan 6, 2022

Fixed the issue with the android build.

@fanquake fanquake force-pushed the drop_TARGET_OS_usage branch from 895e3b6 to b6b6094 Compare January 6, 2022 09:23
@fanquake fanquake changed the title build: reduce TARGET_OS usage in favour of host_os build: remove use of TARGET_OS and BUILD_OS Jan 6, 2022
@fanquake
Copy link
Member Author

fanquake commented Jan 6, 2022

Simplified this further and removed TARGET_OS and BUILD_OS entirely.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DrahtBot
Copy link
Contributor

Guix builds

File commit 9ec3991
(master)
commit 8d18d2d
(master and this pull)
SHA256SUMS.part 2e7b021f8a032087... 1bf43856685539ff...
*-aarch64-linux-gnu-debug.tar.gz f04dbee73b174e6f... ac915c8701dab512...
*-aarch64-linux-gnu.tar.gz c754b36e82e33a9c... b2c005fc381e6327...
*-arm-linux-gnueabihf-debug.tar.gz 25013d4ae19fb6f3... c815d046476ad594...
*-arm-linux-gnueabihf.tar.gz ec025145858460ce... b699a334892f8d95...
*-osx-unsigned.dmg dd865c6fd4218a09... 5e9d02f29561beb6...
*-osx-unsigned.tar.gz f2adf40f7d956e6e... e8edca181c3979b6...
*-osx64.tar.gz 9bf700786395a8fb... 58f04d916891aadc...
*-powerpc64-linux-gnu-debug.tar.gz eba65aa8eaec1c89... 1b61fb6da6d18101...
*-powerpc64-linux-gnu.tar.gz 3312edee780236ee... b1657315b15d65db...
*-powerpc64le-linux-gnu-debug.tar.gz 4ccd57dd41f448eb... c3df477241238908...
*-powerpc64le-linux-gnu.tar.gz 025f050dd642ca2f... da0d5873bfaa7f95...
*-riscv64-linux-gnu-debug.tar.gz 9c3dfcba4deadf0b... 252954b6dcd7056a...
*-riscv64-linux-gnu.tar.gz 54f25a0d36c806fa... eb9215d5d6d027bb...
*-x86_64-linux-gnu-debug.tar.gz 63ebd6c1a1137971... 0af89609e44559b4...
*-x86_64-linux-gnu.tar.gz 1be184e1c61ed869... 1d10c4a876d60588...
*.tar.gz d399991ce771ba6c... 919700a2d81d0577...
guix_build.log 334f236ac4ef766b... f7a4b2fe7866f4bd...
guix_build.log.diff b997768036193b57...

@fanquake
Copy link
Member Author

fanquake commented Apr 7, 2022

Rebased past #24681.

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 7, 2022

Guix builds

File commit 70c5220
(master)
commit ec49664
(master and this pull)
SHA256SUMS.part cbe95639a72684bd... f7bae7e686e6c256...
*-aarch64-linux-gnu-debug.tar.gz 1b57562a55c99cb1... b7fee3a4f9161efe...
*-aarch64-linux-gnu.tar.gz 2a3460f0b7e2991b... bdcdb0a8745b473e...
*-arm-linux-gnueabihf-debug.tar.gz b7ba4565fa521386... c38c45066e20d53b...
*-arm-linux-gnueabihf.tar.gz 5144dce868a4f8b1... f9747f2de8979d75...
*-arm64-apple-darwin-unsigned.dmg 1bec62dd944691c7... 905e294a3bfedbb4...
*-arm64-apple-darwin-unsigned.tar.gz 00975631230f5dac... 5752ba8b30ade7ef...
*-arm64-apple-darwin.tar.gz 422f8d3f49e35031... 74f415be29b5c9a5...
*-powerpc64-linux-gnu-debug.tar.gz 41a3c296c7111825... 3358608156050206...
*-powerpc64-linux-gnu.tar.gz 0b5aa88216a1a1da... 5e8aa8477d67a863...
*-powerpc64le-linux-gnu-debug.tar.gz 8d2c5cadb5123f84... 433142d784ea77c2...
*-powerpc64le-linux-gnu.tar.gz a6709ef0a36ac928... b50ee210d649800e...
*-riscv64-linux-gnu-debug.tar.gz 0caa874390b403e0... c8e3c3b224c6440d...
*-riscv64-linux-gnu.tar.gz b72c08afcaff4327... 5de1f46c3572bfa3...
*-win64-debug.zip f8ed64933518f49f... a57ba8dce7deed8f...
*-win64-setup-unsigned.exe 9c35f54b71b0a79c... 50d61d3340e768df...
*-win64-unsigned.tar.gz 1790ddd61dca688c... b5d0f22f830f7d14...
*-win64.zip 5e2678959dbef2e7... 9df9eaaca8fa6088...
*-x86_64-apple-darwin-unsigned.dmg fbd99acf366db899... c68186cdf897180f...
*-x86_64-apple-darwin-unsigned.tar.gz 1ba73a4f3e50f2c5... 7c52deba60089ff0...
*-x86_64-apple-darwin.tar.gz cf09ef71a2c04555... d72843df6f4ccf40...
*-x86_64-linux-gnu-debug.tar.gz 5bbc013503aeb488... cba767f3f14c3a5b...
*-x86_64-linux-gnu.tar.gz 208176c231dfdc4d... d58d1984140a787d...
*.tar.gz e4658e7f62bbedc4... be76e9455ce0dbf2...
guix_build.log f73c8ad7eaa7adbb... aa6f45876f5a75e1...
guix_build.log.diff f36e5f35e56bf3fc...

@jarolrod
Copy link
Member

Concept ACK

GUIX hashes on x86, mine match fanquake's latest round

find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

68028f87229f37c1db16968cc7f573960e0b8807c907fcc2682224c318eed2ac  guix-build-86851c8e9424/output/aarch64-linux-gnu/SHA256SUMS.part
7eff4657c22ed71181286b753a65a5a4886a0e3ec3990dcd74961c0a5d33e9e0  guix-build-86851c8e9424/output/aarch64-linux-gnu/bitcoin-86851c8e9424-aarch64-linux-gnu-debug.tar.gz
5256ae19e65d9457862b37b68a7f12841c982822d21a03e3f45d0e461a3d3764  guix-build-86851c8e9424/output/aarch64-linux-gnu/bitcoin-86851c8e9424-aarch64-linux-gnu.tar.gz
15908fd7744342c66995d93a15cf08f27588dcf13bb199ce44d7805f50139161  guix-build-86851c8e9424/output/arm-linux-gnueabihf/SHA256SUMS.part
a77f6a0c53b664bdf7a5bd93bd9b7f983a7e9062d85ccae51c6828ccc88ed446  guix-build-86851c8e9424/output/arm-linux-gnueabihf/bitcoin-86851c8e9424-arm-linux-gnueabihf-debug.tar.gz
169d67890877bf9609ad0ac9d04d0651d6b3cb75b112c798f9bc9ac21c99a75b  guix-build-86851c8e9424/output/arm-linux-gnueabihf/bitcoin-86851c8e9424-arm-linux-gnueabihf.tar.gz
c3ef7422d577a34e23ac662dfe6269d7a8aa549cb723375f6e963ead3e2872a3  guix-build-86851c8e9424/output/arm64-apple-darwin/SHA256SUMS.part
a5dd82e4b151898473607b9796529f9e2021d252072b2c0321ddc87706f1ffde  guix-build-86851c8e9424/output/arm64-apple-darwin/bitcoin-86851c8e9424-arm64-apple-darwin-unsigned.dmg
75a8ff020808bbd3faad40c0760f1fef5bf30749e49f047ba13f9f43b9b09c9b  guix-build-86851c8e9424/output/arm64-apple-darwin/bitcoin-86851c8e9424-arm64-apple-darwin-unsigned.tar.gz
c7a0bd10d368be1373b105fab4eca2884a869def0e20d86f3e685a45a7759de9  guix-build-86851c8e9424/output/arm64-apple-darwin/bitcoin-86851c8e9424-arm64-apple-darwin.tar.gz
7fec22ad8ad1b9f6ec0014685ec46db216ae2c38040b2d9b02b6afbe0b726f8d  guix-build-86851c8e9424/output/dist-archive/bitcoin-86851c8e9424.tar.gz
6ad7faff882399eee3d9943fcaaabdae343cbf9e57e6bdd07af5a575735692ee  guix-build-86851c8e9424/output/powerpc64-linux-gnu/SHA256SUMS.part
2f39d53f910340bfb530f55d20c3658a2f4ff6ff854498c4ee81f4448f56595e  guix-build-86851c8e9424/output/powerpc64-linux-gnu/bitcoin-86851c8e9424-powerpc64-linux-gnu-debug.tar.gz
85071756fe637f1e69f68672b946ffd846cd2d940c3ff16e43710fb6cd8eb855  guix-build-86851c8e9424/output/powerpc64-linux-gnu/bitcoin-86851c8e9424-powerpc64-linux-gnu.tar.gz
99faa6d2cf4494ce04de65394a42e915739327fefbb474d162827988d41db97f  guix-build-86851c8e9424/output/powerpc64le-linux-gnu/SHA256SUMS.part
60e047bcfe417966a015b053c2ed866b072d2b2805dde8c9a34233fa2afc03bf  guix-build-86851c8e9424/output/powerpc64le-linux-gnu/bitcoin-86851c8e9424-powerpc64le-linux-gnu-debug.tar.gz
886d223badad0450516de403e308d550ea298ff240a2db5e1064d08f38af7a62  guix-build-86851c8e9424/output/powerpc64le-linux-gnu/bitcoin-86851c8e9424-powerpc64le-linux-gnu.tar.gz
02b68f0182a69f10e0b84438bba6fa4622a1e4f3d2eca9b9600caf3e8107b7ad  guix-build-86851c8e9424/output/riscv64-linux-gnu/SHA256SUMS.part
9a7121ad57093b5134c836367fd0f333b859e460374c5b3f5bcd50754d46b5ff  guix-build-86851c8e9424/output/riscv64-linux-gnu/bitcoin-86851c8e9424-riscv64-linux-gnu-debug.tar.gz
fbb814a427b5312063f1e136ad53728709e93647d62d927b200fe20e8794a8c4  guix-build-86851c8e9424/output/riscv64-linux-gnu/bitcoin-86851c8e9424-riscv64-linux-gnu.tar.gz
4b2b297264d1b18f574970b413571452e57ea2b7734b2e19b798db0651827dc5  guix-build-86851c8e9424/output/x86_64-apple-darwin/SHA256SUMS.part
db4e7273328d8a6643c4c96a1aef17b40e0e798ff42c4c68b8cea313d099f314  guix-build-86851c8e9424/output/x86_64-apple-darwin/bitcoin-86851c8e9424-x86_64-apple-darwin-unsigned.dmg
88835ac28bc88fa3f454ff771c18a6df18605cb046aa82f1e77e3e838d92a7cd  guix-build-86851c8e9424/output/x86_64-apple-darwin/bitcoin-86851c8e9424-x86_64-apple-darwin-unsigned.tar.gz
3b85604d469a18966743ef4d4711a800f1cd8ebba7cdc8d949348a60f5851815  guix-build-86851c8e9424/output/x86_64-apple-darwin/bitcoin-86851c8e9424-x86_64-apple-darwin.tar.gz
90850966a4c7a8fd44b14a95b29e6aaf5931ff00e78abe1623d79ac1d77a95ba  guix-build-86851c8e9424/output/x86_64-linux-gnu/SHA256SUMS.part
f960bfb2a7f2617aa530e96b03bda3ba89b4b39b4c6b1ff99bf2dbec2f6bcbcf  guix-build-86851c8e9424/output/x86_64-linux-gnu/bitcoin-86851c8e9424-x86_64-linux-gnu-debug.tar.gz
45bdb6ce51d9805f1ac6f11b7d61c4e8ef3c03afd2237904c16efefbd9130ba2  guix-build-86851c8e9424/output/x86_64-linux-gnu/bitcoin-86851c8e9424-x86_64-linux-gnu.tar.gz
2533b66a1fc86e36f371ce756c3c91b012cb8cf45c24fe8d06a0ffdaf44fdc79  guix-build-86851c8e9424/output/x86_64-w64-mingw32/SHA256SUMS.part
1666ce76ea847707932eed14eb9ac7ed9a64a86e33a5458a505e1ff7cf718d31  guix-build-86851c8e9424/output/x86_64-w64-mingw32/bitcoin-86851c8e9424-win64-debug.zip
21a18fa4eeaab9c3284894b2c4870ec1516cd5d013ef6580f9b2e60e1c0524a4  guix-build-86851c8e9424/output/x86_64-w64-mingw32/bitcoin-86851c8e9424-win64-setup-unsigned.exe
130d005feaf0e16928c5f7c10bc9d87cc3d713e7310ffdb5fcf633d6e017cfd5  guix-build-86851c8e9424/output/x86_64-w64-mingw32/bitcoin-86851c8e9424-win64-unsigned.tar.gz
1c0e77afa23541dccf27a850e00d8ecade82c95c70a58bb09499e43a61e48d44  guix-build-86851c8e9424/output/x86_64-w64-mingw32/bitcoin-86851c8e9424-win64.zip

if test "$TARGET_OS" = "windows"; then
NATPMP_CPPFLAGS="-DSTATICLIB -DNATPMP_STATICLIB"
fi
AS_CASE([$host_os], [*mingw*], [NATPMP_CPPFLAGS="-DSTATICLIB -DNATPMP_STATICLIB"])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about non-mingw windows? Does this make it more difficult to switch compilers later? E.g. does the clang windows tuple have mingw in it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in that case there is a different tuple. Doing this isn't really a priority, so I'll close this for now, and we can potentially revisit later.

@fanquake fanquake closed this Apr 20, 2022
@bitcoin bitcoin locked and limited conversation to collaborators Apr 20, 2023
@fanquake fanquake deleted the drop_TARGET_OS_usage branch May 16, 2024 05:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants