-
Notifications
You must be signed in to change notification settings - Fork 37.7k
depends: don't use -h with touch on OpenBSD #29598
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested ACK 8aff3fd
Ran both master and PR branch on OpenBSD 7.4 and can confirm that the patch solves the problem. Thanks for fixing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK 8aff3fd, tested on OpenBSD 7.1 by running the following commands twice and observing the same output:
$ gmake -C depends clean
$ gmake -C depends
$ find depends/built/amd64-unknown-openbsd7.1/ -name '*.hash' | sort | xargs cat
SHA256 (bdb-4.8.30-6516a88287c.tar.gz) = cf26a2c6cedaf0554dc9888cee82ef4b5ad1ae7728a8f7d1006e45583bc742a6
SHA256 (boost-1.81.0-475a856846a.tar.gz) = 258aab7f0aef15c5031d47c085ed064115886db8626ca1efef0bf701d4837652
SHA256 (libevent-2.1.12-stable-4d253ff0406.tar.gz) = 9d70b82ae7bdb1764f917928b01bbf263710f390eb0d6b8bd0cab3672a924c8c
SHA256 (libnatpmp-07004b97cf691774efebe70404cf22201e4d330d-b9636c47f00.tar.gz) = 6a386eb2d5d91b9ac5eedb825dccdb792fc8560fe9366e274be2a247926b48a3
SHA256 (miniupnpc-2.2.2-a7b06f28009.tar.gz) = e2a3498957d6f530709e69b8ac634203a238b7e50dcad3053118237b89c22960
SHA256 (sqlite-3380500-29dff760800.tar.gz) = 1ab5d9b67ddd44f99911d0445176537d4af9a8da4d73a1ca22524ee2df848e7f
SHA256 (zeromq-4.3.5-e63f322fe6c.tar.gz) = 3fdcae0f959958311b51e7a2adb6e42535f8dce6383eb02e3651adf6c0b834f7
Guix Build (aarch64): 7c18f54c6e6511d9bec1b1ded624a401dbf804dc53154a2a59cd2b02a0ac346c guix-build-8aff3fd29244/output/aarch64-linux-gnu/SHA256SUMS.part
81a75f0c95d14317eb7a76fbafcc9855958a4598af84618c17fb315af3b139a0 guix-build-8aff3fd29244/output/aarch64-linux-gnu/bitcoin-8aff3fd29244-aarch64-linux-gnu-debug.tar.gz
f2afe3e6ec7412c6d295c07ca85d8cce0ddfa50801d53a7a46442ea8685b434c guix-build-8aff3fd29244/output/aarch64-linux-gnu/bitcoin-8aff3fd29244-aarch64-linux-gnu.tar.gz
dadd7c76eef296fd51ced81ecae9965e8748872b0d70c60fc9df9742ec42498a guix-build-8aff3fd29244/output/arm-linux-gnueabihf/SHA256SUMS.part
c7250653556aa7e564596f1962d52a88b66ddf51a6495af54a3154c29ea4d0bb guix-build-8aff3fd29244/output/arm-linux-gnueabihf/bitcoin-8aff3fd29244-arm-linux-gnueabihf-debug.tar.gz
cb24fa5439b50d9cdb079a5a1cf3b37fa5df67031bdabf762ff24499be480add guix-build-8aff3fd29244/output/arm-linux-gnueabihf/bitcoin-8aff3fd29244-arm-linux-gnueabihf.tar.gz
1f66c8b27e315c6132f2724c300ad9a462eba8ce1c7e7daf7bc0513584a80a2d guix-build-8aff3fd29244/output/arm64-apple-darwin/SHA256SUMS.part
bcbd6bf475645f7afab8c7d967c6a1db875b4877d341850844bf8a0ce6b1f74d guix-build-8aff3fd29244/output/arm64-apple-darwin/bitcoin-8aff3fd29244-arm64-apple-darwin-unsigned.tar.gz
223f0208d1f5744302da8bf39be9c83a39cade134e509e5edc8d127b82fb296c guix-build-8aff3fd29244/output/arm64-apple-darwin/bitcoin-8aff3fd29244-arm64-apple-darwin-unsigned.zip
94427c0531286bdbbbaa833fd5cf5796d0580958de2b472ef649894c0d61ad30 guix-build-8aff3fd29244/output/arm64-apple-darwin/bitcoin-8aff3fd29244-arm64-apple-darwin.tar.gz
e06e10b80fa53f2a99608d37f61d7c868b530ac62a86522ffe7cf224bc00e14c guix-build-8aff3fd29244/output/dist-archive/bitcoin-8aff3fd29244.tar.gz
36d7411e09f41966d60bf0011444bebead42e373184a8546fd63f27841fc47ef guix-build-8aff3fd29244/output/powerpc64-linux-gnu/SHA256SUMS.part
bc6c5e178c24eb7b41cea00d44942e1babab72eed3774ca39d61acaad8ac6765 guix-build-8aff3fd29244/output/powerpc64-linux-gnu/bitcoin-8aff3fd29244-powerpc64-linux-gnu-debug.tar.gz
2891b24547a38398187bd30a7e15d2c952ca98874a8a00ce224c71e07e336ebb guix-build-8aff3fd29244/output/powerpc64-linux-gnu/bitcoin-8aff3fd29244-powerpc64-linux-gnu.tar.gz
2e22c351009b05b3553fb027cf413dbf4dfe08071c7223d30e41af9d658ed2a7 guix-build-8aff3fd29244/output/powerpc64le-linux-gnu/SHA256SUMS.part
39bc3f0978a3bbddde3bdb9e5496859d05aa92493138e446f0376686f981e977 guix-build-8aff3fd29244/output/powerpc64le-linux-gnu/bitcoin-8aff3fd29244-powerpc64le-linux-gnu-debug.tar.gz
7f9e5ddbc1933b04c2b7b97e40c5ce2967be7247cbade9538bfdd24aa2adeac9 guix-build-8aff3fd29244/output/powerpc64le-linux-gnu/bitcoin-8aff3fd29244-powerpc64le-linux-gnu.tar.gz
5cabe1de6767faae151fe6f4c053f26f3e7096832f562cea740fdb9b445f25f3 guix-build-8aff3fd29244/output/riscv64-linux-gnu/SHA256SUMS.part
e11de10db6642abeed828bb07d8d8dd8be4911a1437631071538c12e3a2dfa2b guix-build-8aff3fd29244/output/riscv64-linux-gnu/bitcoin-8aff3fd29244-riscv64-linux-gnu-debug.tar.gz
557df1558616e6993899810cf66d0770e0f70558859aae884044c725ceff1a03 guix-build-8aff3fd29244/output/riscv64-linux-gnu/bitcoin-8aff3fd29244-riscv64-linux-gnu.tar.gz
b1f9273b066193a72c510f1a9460e4376b2e57edf71ac12a26471003cf6c45e3 guix-build-8aff3fd29244/output/x86_64-apple-darwin/SHA256SUMS.part
0aa57700efe893aacec94e1963a37eae9dac8f7df7292d1a192c0206a3995840 guix-build-8aff3fd29244/output/x86_64-apple-darwin/bitcoin-8aff3fd29244-x86_64-apple-darwin-unsigned.tar.gz
c900e069f407302c4139bfb0a29f85d96ab9cd3bd9dbe44f865a22f78b0014c6 guix-build-8aff3fd29244/output/x86_64-apple-darwin/bitcoin-8aff3fd29244-x86_64-apple-darwin-unsigned.zip
a9a6ffddc3120ba26e4395830152ff5ba589623fdac160e4b1e55cb183fcc537 guix-build-8aff3fd29244/output/x86_64-apple-darwin/bitcoin-8aff3fd29244-x86_64-apple-darwin.tar.gz
28cc074089f6d5ee8c078cf9dbe94048f5836236f31ae7d007d6df35f19e4fb2 guix-build-8aff3fd29244/output/x86_64-linux-gnu/SHA256SUMS.part
89b37452d09b07db19814d4c3828ca7155bc6aa5bd3734bf2a665593fd254e66 guix-build-8aff3fd29244/output/x86_64-linux-gnu/bitcoin-8aff3fd29244-x86_64-linux-gnu-debug.tar.gz
aec6e33408dc6f65e31f6749a68889dbbc4e909a4275ec9b191c7425c9fec21d guix-build-8aff3fd29244/output/x86_64-linux-gnu/bitcoin-8aff3fd29244-x86_64-linux-gnu.tar.gz
20b1b23bb62bb27738b790c98e59d23df7b0a57ca7453713c0c04654387ef360 guix-build-8aff3fd29244/output/x86_64-w64-mingw32/SHA256SUMS.part
d2ab6315cf2490aebe353394506308cf69a9338870beaa6ae67d2fef52b1a170 guix-build-8aff3fd29244/output/x86_64-w64-mingw32/bitcoin-8aff3fd29244-win64-debug.zip
1905bbfb6d902c52966a03757f8856bc8f88b98d4f9ce4849929aaa770d93aae guix-build-8aff3fd29244/output/x86_64-w64-mingw32/bitcoin-8aff3fd29244-win64-setup-unsigned.exe
49cd4d656595420e6e0e205ce72d58cf7f6b0609ec92f4f666561376eed53f5e guix-build-8aff3fd29244/output/x86_64-w64-mingw32/bitcoin-8aff3fd29244-win64-unsigned.tar.gz
52c669fa1910b19e65a3c047489e6a3fca33e784990c8c16616a98dbb9274a45 guix-build-8aff3fd29244/output/x86_64-w64-mingw32/bitcoin-8aff3fd29244-win64.zip |
, bitcoin#28622, bitcoin#28880, bitcoin#29185, bitcoin#29170, bitcoin#29233, bitcoin#29298, bitcoin#29598, bitcoin#29732, bitcoin#29890, bitcoin#29739, bitcoin#30074, bitcoin#30198, bitcoin#29072 (toolchain backports: part 2) 1506d9d merge bitcoin#29072: use `-no_exported_symbols` on macOS (Kittywhiskers Van Gogh) 9247960 merge bitcoin#30198: qt 5.15.14 and fix macOS build with Clang 18 (Kittywhiskers Van Gogh) 5585e7a merge bitcoin#30074: use ENV flags in get_arch (Kittywhiskers Van Gogh) decd420 merge bitcoin#29739: swap cctools otool for llvm-objdump (Kittywhiskers Van Gogh) 0f8c420 merge bitcoin#29890: remove some tools when cross-compiling for macOS (Kittywhiskers Van Gogh) 936da1a merge bitcoin#29732: qt 5.15.13 (Kittywhiskers Van Gogh) c294b47 revert: patch qt to make placeholders differ from actual text (Kittywhiskers Van Gogh) af7090c merge bitcoin#29598: don't use -h with touch on OpenBSD (Kittywhiskers Van Gogh) ebf8ff2 merge bitcoin#29298: patch libtool out of libnatpmp/miniupnpc (Kittywhiskers Van Gogh) 070b876 merge bitcoin#29233: depends move macOS C(XX) FLAGS out of C & CXX (Kittywhiskers Van Gogh) d838481 revert dash#2398: Force fvisibility=hidden when compiling on macos (Kittywhiskers Van Gogh) 59a18f9 merge bitcoin#29170: add macho branch protection check (Kittywhiskers Van Gogh) cb024d9 merge bitcoin#29185: remove `--enable-lto` (Kittywhiskers Van Gogh) 6d75a81 merge bitcoin#28880: switch to using LLVM 17.x for macOS builds (Kittywhiskers Van Gogh) 7b0a1f2 merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0) (Kittywhiskers Van Gogh) 02eb735 merge bitcoin#24948: fix typo in permissions (Kittywhiskers Van Gogh) 2739107 merge bitcoin#24534: make gen-sdk deterministic (Kittywhiskers Van Gogh) ab10bf9 merge bitcoin#24241: cleanup doc on need of Developer Account to obtain macOS SDK (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependent on #6384 * Dependency for #6389 * The Qt patch introduced in [dash#5596](#5596), `fix_qt_placeholders.patch`, was a portion of a suggested workaround for QTBUG-92199 ([source](https://bugreports.qt.io/browse/QTBUG-92199?focusedId=669719&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-669719)) but since then, a fix ([here](https://codereview.qt-project.org/c/qt/qtbase/+/434310)) has made its way to 5.15.12 and we are upgrading to 5.15.14 from 5.15.11. So we can safely remove this patch. ## Breaking Changes None expected ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 1506d9d PastaPastaPasta: utACK 1506d9d Tree-SHA512: df8e4ea0ce9e7b269d248518698f0566b5eca1a54cdfb53f5b213b90fb5177e5a5df44eaeb6f3fc014cd93351c9245736bb2fd52bc2af4ae274d8fa93e601b07
Should fix #29447.