depends: don't use -h with touch on OpenBSD

fanquake commented at 1:47 pm on March 8, 2024: member

Should fix #29447.

Should fix #29447.

8aff3fd292

fanquake requested review from theStack on Mar 8, 2024

DrahtBot commented at 1:47 pm on March 8, 2024: contributor

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

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	theStack, hebasto

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#21778 (build: LLD based macOS toolchain by fanquake)

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.

DrahtBot added the label Build system on Mar 8, 2024

theStack approved

theStack commented at 6:24 pm on March 10, 2024: contributor

Tested ACK 8aff3fd292442c50b61db02527f68f9258263e4a

Ran both master and PR branch on OpenBSD 7.4 and can confirm that the patch solves the problem. Thanks for fixing.

hebasto approved

hebasto commented at 9:41 pm on March 10, 2024: member

ACK 8aff3fd292442c50b61db02527f68f9258263e4a, tested on OpenBSD 7.1 by running the following commands twice and observing the same output:

0$ gmake -C depends clean
1$ gmake -C depends
2$ find depends/built/amd64-unknown-openbsd7.1/ -name '*.hash' | sort | xargs cat
3SHA256 (bdb-4.8.30-6516a88287c.tar.gz) = cf26a2c6cedaf0554dc9888cee82ef4b5ad1ae7728a8f7d1006e45583bc742a6
4SHA256 (boost-1.81.0-475a856846a.tar.gz) = 258aab7f0aef15c5031d47c085ed064115886db8626ca1efef0bf701d4837652
5SHA256 (libevent-2.1.12-stable-4d253ff0406.tar.gz) = 9d70b82ae7bdb1764f917928b01bbf263710f390eb0d6b8bd0cab3672a924c8c
6SHA256 (libnatpmp-07004b97cf691774efebe70404cf22201e4d330d-b9636c47f00.tar.gz) = 6a386eb2d5d91b9ac5eedb825dccdb792fc8560fe9366e274be2a247926b48a3
7SHA256 (miniupnpc-2.2.2-a7b06f28009.tar.gz) = e2a3498957d6f530709e69b8ac634203a238b7e50dcad3053118237b89c22960
8SHA256 (sqlite-3380500-29dff760800.tar.gz) = 1ab5d9b67ddd44f99911d0445176537d4af9a8da4d73a1ca22524ee2df848e7f
9SHA256 (zeromq-4.3.5-e63f322fe6c.tar.gz) = 3fdcae0f959958311b51e7a2adb6e42535f8dce6383eb02e3651adf6c0b834f7

maflcko added the label DrahtBot Guix build requested on Mar 11, 2024

fanquake commented at 1:59 pm on March 11, 2024: member

Guix Build (aarch64):

 07c18f54c6e6511d9bec1b1ded624a401dbf804dc53154a2a59cd2b02a0ac346c  guix-build-8aff3fd29244/output/aarch64-linux-gnu/SHA256SUMS.part
 181a75f0c95d14317eb7a76fbafcc9855958a4598af84618c17fb315af3b139a0  guix-build-8aff3fd29244/output/aarch64-linux-gnu/bitcoin-8aff3fd29244-aarch64-linux-gnu-debug.tar.gz
 2f2afe3e6ec7412c6d295c07ca85d8cce0ddfa50801d53a7a46442ea8685b434c  guix-build-8aff3fd29244/output/aarch64-linux-gnu/bitcoin-8aff3fd29244-aarch64-linux-gnu.tar.gz
 3dadd7c76eef296fd51ced81ecae9965e8748872b0d70c60fc9df9742ec42498a  guix-build-8aff3fd29244/output/arm-linux-gnueabihf/SHA256SUMS.part
 4c7250653556aa7e564596f1962d52a88b66ddf51a6495af54a3154c29ea4d0bb  guix-build-8aff3fd29244/output/arm-linux-gnueabihf/bitcoin-8aff3fd29244-arm-linux-gnueabihf-debug.tar.gz
 5cb24fa5439b50d9cdb079a5a1cf3b37fa5df67031bdabf762ff24499be480add  guix-build-8aff3fd29244/output/arm-linux-gnueabihf/bitcoin-8aff3fd29244-arm-linux-gnueabihf.tar.gz
 61f66c8b27e315c6132f2724c300ad9a462eba8ce1c7e7daf7bc0513584a80a2d  guix-build-8aff3fd29244/output/arm64-apple-darwin/SHA256SUMS.part
 7bcbd6bf475645f7afab8c7d967c6a1db875b4877d341850844bf8a0ce6b1f74d  guix-build-8aff3fd29244/output/arm64-apple-darwin/bitcoin-8aff3fd29244-arm64-apple-darwin-unsigned.tar.gz
 8223f0208d1f5744302da8bf39be9c83a39cade134e509e5edc8d127b82fb296c  guix-build-8aff3fd29244/output/arm64-apple-darwin/bitcoin-8aff3fd29244-arm64-apple-darwin-unsigned.zip
 994427c0531286bdbbbaa833fd5cf5796d0580958de2b472ef649894c0d61ad30  guix-build-8aff3fd29244/output/arm64-apple-darwin/bitcoin-8aff3fd29244-arm64-apple-darwin.tar.gz
10e06e10b80fa53f2a99608d37f61d7c868b530ac62a86522ffe7cf224bc00e14c  guix-build-8aff3fd29244/output/dist-archive/bitcoin-8aff3fd29244.tar.gz
1136d7411e09f41966d60bf0011444bebead42e373184a8546fd63f27841fc47ef  guix-build-8aff3fd29244/output/powerpc64-linux-gnu/SHA256SUMS.part
12bc6c5e178c24eb7b41cea00d44942e1babab72eed3774ca39d61acaad8ac6765  guix-build-8aff3fd29244/output/powerpc64-linux-gnu/bitcoin-8aff3fd29244-powerpc64-linux-gnu-debug.tar.gz
132891b24547a38398187bd30a7e15d2c952ca98874a8a00ce224c71e07e336ebb  guix-build-8aff3fd29244/output/powerpc64-linux-gnu/bitcoin-8aff3fd29244-powerpc64-linux-gnu.tar.gz
142e22c351009b05b3553fb027cf413dbf4dfe08071c7223d30e41af9d658ed2a7  guix-build-8aff3fd29244/output/powerpc64le-linux-gnu/SHA256SUMS.part
1539bc3f0978a3bbddde3bdb9e5496859d05aa92493138e446f0376686f981e977  guix-build-8aff3fd29244/output/powerpc64le-linux-gnu/bitcoin-8aff3fd29244-powerpc64le-linux-gnu-debug.tar.gz
167f9e5ddbc1933b04c2b7b97e40c5ce2967be7247cbade9538bfdd24aa2adeac9  guix-build-8aff3fd29244/output/powerpc64le-linux-gnu/bitcoin-8aff3fd29244-powerpc64le-linux-gnu.tar.gz
175cabe1de6767faae151fe6f4c053f26f3e7096832f562cea740fdb9b445f25f3  guix-build-8aff3fd29244/output/riscv64-linux-gnu/SHA256SUMS.part
18e11de10db6642abeed828bb07d8d8dd8be4911a1437631071538c12e3a2dfa2b  guix-build-8aff3fd29244/output/riscv64-linux-gnu/bitcoin-8aff3fd29244-riscv64-linux-gnu-debug.tar.gz
19557df1558616e6993899810cf66d0770e0f70558859aae884044c725ceff1a03  guix-build-8aff3fd29244/output/riscv64-linux-gnu/bitcoin-8aff3fd29244-riscv64-linux-gnu.tar.gz
20b1f9273b066193a72c510f1a9460e4376b2e57edf71ac12a26471003cf6c45e3  guix-build-8aff3fd29244/output/x86_64-apple-darwin/SHA256SUMS.part
210aa57700efe893aacec94e1963a37eae9dac8f7df7292d1a192c0206a3995840  guix-build-8aff3fd29244/output/x86_64-apple-darwin/bitcoin-8aff3fd29244-x86_64-apple-darwin-unsigned.tar.gz
22c900e069f407302c4139bfb0a29f85d96ab9cd3bd9dbe44f865a22f78b0014c6  guix-build-8aff3fd29244/output/x86_64-apple-darwin/bitcoin-8aff3fd29244-x86_64-apple-darwin-unsigned.zip
23a9a6ffddc3120ba26e4395830152ff5ba589623fdac160e4b1e55cb183fcc537  guix-build-8aff3fd29244/output/x86_64-apple-darwin/bitcoin-8aff3fd29244-x86_64-apple-darwin.tar.gz
2428cc074089f6d5ee8c078cf9dbe94048f5836236f31ae7d007d6df35f19e4fb2  guix-build-8aff3fd29244/output/x86_64-linux-gnu/SHA256SUMS.part
2589b37452d09b07db19814d4c3828ca7155bc6aa5bd3734bf2a665593fd254e66  guix-build-8aff3fd29244/output/x86_64-linux-gnu/bitcoin-8aff3fd29244-x86_64-linux-gnu-debug.tar.gz
26aec6e33408dc6f65e31f6749a68889dbbc4e909a4275ec9b191c7425c9fec21d  guix-build-8aff3fd29244/output/x86_64-linux-gnu/bitcoin-8aff3fd29244-x86_64-linux-gnu.tar.gz
2720b1b23bb62bb27738b790c98e59d23df7b0a57ca7453713c0c04654387ef360  guix-build-8aff3fd29244/output/x86_64-w64-mingw32/SHA256SUMS.part
28d2ab6315cf2490aebe353394506308cf69a9338870beaa6ae67d2fef52b1a170  guix-build-8aff3fd29244/output/x86_64-w64-mingw32/bitcoin-8aff3fd29244-win64-debug.zip
291905bbfb6d902c52966a03757f8856bc8f88b98d4f9ce4849929aaa770d93aae  guix-build-8aff3fd29244/output/x86_64-w64-mingw32/bitcoin-8aff3fd29244-win64-setup-unsigned.exe
3049cd4d656595420e6e0e205ce72d58cf7f6b0609ec92f4f666561376eed53f5e  guix-build-8aff3fd29244/output/x86_64-w64-mingw32/bitcoin-8aff3fd29244-win64-unsigned.tar.gz
3152c669fa1910b19e65a3c047489e6a3fca33e784990c8c16616a98dbb9274a45  guix-build-8aff3fd29244/output/x86_64-w64-mingw32/bitcoin-8aff3fd29244-win64.zip

DrahtBot commented at 11:08 pm on March 11, 2024: contributor

Guix builds (on x86_64)

File	commit 4a903741b0bc128745b1096586329456d1f1c447(master)	commit dc826b5ef89215c9fc1e7fb3f1b8e140bedc0ea9(master and this pull)
SHA256SUMS.part	`930d4f0a6908d59c...`	`f58f8a055ec9ac29...`
*-aarch64-linux-gnu-debug.tar.gz	`7f47ddb4c6eb61c2...`	`490d5cbf6c549810...`
*-aarch64-linux-gnu.tar.gz	`b10df1a4271b26c2...`	`6691a7111f879c16...`
*-arm-linux-gnueabihf-debug.tar.gz	`109ae65537432583...`	`c725e505e707e59b...`
*-arm-linux-gnueabihf.tar.gz	`e106590c6aebdce1...`	`4ff214235c868038...`
*-arm64-apple-darwin-unsigned.tar.gz	`33876a68e52cb10d...`	`57b250d6f64db235...`
*-arm64-apple-darwin-unsigned.zip	`24796adfc4406382...`	`44caaf1001e772fb...`
*-arm64-apple-darwin.tar.gz	`14ab9af5f7120df5...`	`86e5c9ec6b96fb38...`
*-powerpc64-linux-gnu-debug.tar.gz	`fe6daf85b9078f05...`	`ca829dcb696549cd...`
*-powerpc64-linux-gnu.tar.gz	`84cf585ca0fdcb39...`	`12101eb271f9e054...`
*-powerpc64le-linux-gnu-debug.tar.gz	`bbfb8f3985023f23...`	`9bea0b658b9f7ef9...`
*-powerpc64le-linux-gnu.tar.gz	`c5b1dd4d00bdefa2...`	`053c341c41883093...`
*-riscv64-linux-gnu-debug.tar.gz	`bd11d9b91db22a0c...`	`60179f9a44893923...`
*-riscv64-linux-gnu.tar.gz	`5fa020b95c818b53...`	`295836ee8d0097b6...`
*-x86_64-apple-darwin-unsigned.tar.gz	`13740aa52c6b087e...`	`639dd4294fb5fbd7...`
*-x86_64-apple-darwin-unsigned.zip	`c524132ba3bf7a2d...`	`3e1552d250069245...`
*-x86_64-apple-darwin.tar.gz	`b9ae12ca3ba44fc4...`	`00d78e0f445c5121...`
*-x86_64-linux-gnu-debug.tar.gz	`e2c93e2376aea295...`	`1b67d8a5ca94fa48...`
*-x86_64-linux-gnu.tar.gz	`e13849d16d231024...`	`2d47e7a10addaba5...`
*.tar.gz	`0407d0d08f125b98...`	`73ecc0a14d7bf8b9...`
guix_build.log	`06f6439641384562...`	`fe6beaf843300386...`
guix_build.log.diff		`6e90597ea9703bdb...`

DrahtBot removed the label DrahtBot Guix build requested on Mar 11, 2024

fanquake merged this on Mar 12, 2024

fanquake closed this on Mar 12, 2024

fanquake deleted the branch on Mar 12, 2024

depends: don’t use -h with touch on OpenBSD #29598

Code Coverage

Reviews

Conflicts

Guix builds (on x86_64)