forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
backport: merge bitcoin#31100, #31626, #31840, #30584, #31982, #32086, #31998, #32505, #32568, #32690, #32731, #32716, #32837, #32266, #30095, #30137, #33580, partial bitcoin#30454 (build backports: part 4) #6919
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
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
67aa238
merge bitcoin#31100: remove dependency install instructions from win …
kwvg b443c14
partial bitcoin#30454: Introduce CMake-based build system
kwvg 8d887c3
merge bitcoin#31626: Use base system's `sha256sum` utility on FreeBSD
kwvg e6d6d17
merge bitcoin#31840: add missing Darwin objcopy
kwvg 86d0a27
merge bitcoin#30584: Make default `host` and `build` comparable
kwvg c8e27a2
merge bitcoin#31982: rename libmultiprocess repository
kwvg 00350a0
merge bitcoin#32086: Shuffle depends instructions and recommend moder…
kwvg 6020cdc
merge bitcoin#31998: patch around PlacementNew issue in capnp
kwvg d4bc0aa
merge bitcoin#32505: bump to latest config.guess and config.sub
kwvg 8d90c3c
merge bitcoin#32568: use "mkdir -p" when installing xproto
kwvg 44d32a3
merge bitcoin#32690: fix multiprocess build on OpenBSD (apply capnp p…
kwvg ee9e934
build: check against `$host` instead of `TARGET_OS` in stacktrace search
kwvg ca52975
merge bitcoin#32731: Build `qt` package for FreeBSD hosts
kwvg 61f2a23
merge bitcoin#32716: Override host compilers for FreeBSD and OpenBSD
kwvg 6e66ef8
merge bitcoin#32837: fix libevent `_WIN32_WINNT` usage
kwvg 4e57d1a
merge bitcoin#32266: Avoid `warning: "_FORTIFY_SOURCE"` redefined for…
kwvg dcf67c7
merge bitcoin#30095: avoid using thread_local variable that has a des…
kwvg b7febbe
merge bitcoin#30137: Remove `--enable-threadlocal`
kwvg d5dffb6
merge bitcoin#33580: Use $(package)_file_name when downloading from t…
kwvg f97d3d6
fix: skip `EXPORTED_SYMBOLS` validation on ELF targets
kwvg 8e79c7a
fix: allow `dbghelp.dll` for PE targets
kwvg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| build_freebsd_CC=clang | ||
| build_freebsd_CXX=clang++ | ||
|
|
||
| build_freebsd_SHA256SUM = shasum -a 256 | ||
| build_freebsd_SHA256SUM = sha256sum | ||
| build_freebsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o | ||
|
|
||
| # freebsd host on freebsd builder: override freebsd host preferences. | ||
| freebsd_CC = clang | ||
| freebsd_CXX = clang++ | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,13 @@ | ||
| build_openbsd_CC = clang | ||
| build_openbsd_CXX = clang++ | ||
|
|
||
| build_openbsd_SHA256SUM = sha256 | ||
| build_openbsd_SHA256SUM = sha256 -r | ||
| build_openbsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o | ||
|
|
||
| build_openbsd_TAR = gtar | ||
| # openBSD touch doesn't understand -h | ||
| build_openbsd_TOUCH = touch -m -t 200001011200 | ||
|
|
||
| # openbsd host on openbsd builder: override openbsd host preferences. | ||
| openbsd_CC = clang | ||
| openbsd_CXX = clang++ |
Oops, something went wrong.
Oops, something went wrong.
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.
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.
🧩 Analysis chain
Ensure
sha256sumis available on FreeBSD builders (or add fallback).FreeBSD base ships
sha256, notsha256sum. If Guix/Coreutils isn’t present on the FreeBSD builder,-cverification will fail.Option A: verify
sha256sumexists in your FreeBSD build env.Option B: switch back to a portable tool or add a guarded fallback.
Based on learnings.
🏁 Script executed:
Length of output: 0
I need to examine the codebase context to properly assess this issue. Let me gather more information about the build environment setup and how SHA256 tools are handled across different builders.
🏁 Script executed:
Length of output: 1345
🏁 Script executed:
Length of output: 908
Let me fix the syntax errors and properly search the codebase:
🏁 Script executed:
Length of output: 733
🏁 Script executed:
Length of output: 8305
💡 Result:
Short answer: FreeBSD historically provided a sha256 command (from the base's libmd/OpenSSL utilities) while the GNU-style sha256sum was not in base until more recently. Recent FreeBSD releases (e.g. FreeBSD 14 series) include a sha256sum manpage and the utility is available in base; older releases relied on sha256 / shasum (from ports/perl/coreutils) or openssl dgst. Check your installed release to see which is present (which sha256 sha256sum shasum). [1][2][3]
Sources:
🏁 Script executed:
Length of output: 1524
🏁 Script executed:
Length of output: 660
🏁 Script executed:
Length of output: 4388
🏁 Script executed:
Length of output: 5635
Revert
sha256sumto portableshasum -a 256or ensure coreutils availability.This is a regression: the recent change (commit 8d887c3, Jan 9) switched FreeBSD from
shasum -a 256tosha256sum. However, FreeBSD 12.3 does not include sha256sum in base, and your build documentation explicitly targets FreeBSD 12.3. The priorshasum -a 256was portable across BSD variants.Either revert to
shasum -a 256(the documented target won't have sha256sum without coreutils), ensure coreutils is a declared FreeBSD build dependency, or update documentation to require FreeBSD 14+.🤖 Prompt for AI Agents