Project Tags

None

Referenced Files

	F86007765: D20567.1791422797.diff
	Wed, Oct 7, 01:26

	F86007764: D20567.1791422794.diff
	Wed, Oct 7, 01:26

	F86007763: D20567.1791422782.diff
	Wed, Oct 7, 01:26

	F86007753: D20567.1791422753.diff
	Wed, Oct 7, 01:25

	F86007751: D20567.1791422713.diff
	Wed, Oct 7, 01:25

	F86007750: D20567.1791422701.diff
	Wed, Oct 7, 01:25

	F86007747: D20567.1791422683.diff
	Wed, Oct 7, 01:24

	F86001286: D20567.1791390112.diff
	Tue, Oct 6, 16:21

Subscribers

Fabien

Tokens

"Love" token, awarded by teamcity.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABC5dd2fd9d8c54: guix: update time-machine to c5eee3336cc1d10a3cc1c97fde2809c3451624d3

Summary

guix: add --no-same-owner to TAR_OPTIONS

So it's used to extract tarballs.

guix: update to c5eee3336cc1d10a3cc1c97fde2809c3451624d3

Package updates:
binutils 2.41 -> 2.44
diffutils 3.10 -> 3.12
file 5.45 -> 5.46
git-minimal 2.46.0 -> 2.52.0
(base) glibc 2.39 -> 2.41
gzip 1.13 -> 1.14
linux-headers 6.1.119 -> 6.1.166
LLVM/Clang 19.1.4 -> 19.1.7
mingw-w64 12.0.0 -> 13.0.0
nsis 3.10 -> 3.11
python-minimal 3.10 -> 3.11

CMake 4.x becomes available.
Clang/LLVM 20 & 21 become available.

guix: drop CMake workaround

We are now using 3.31.x.

guix: switch to upstream osslsigncode package

guix: switch to upstream python-lief package

ci: use LIEF 0.17.5 in lint job

guix: switch to upstream python-oscrypto package

guix: combine gcc-libgcc-patches with base-gcc

guix: use latest glibc 2.31

https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/release/2.31/master.

guix: document when GCC SSA gen patch can be removed

This is a backport of core#34550
Depends on D20566
Note that we still need nns-certs, as we use curl for rustup

Test Plan

guix builds

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Sep 4 2026, 16:06

PiRK held this revision as a draft.

Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 4 2026, 16:06

teamcity edited the summary of this revision. (Show Details)Sep 4 2026, 16:06

@bot guix-linux guix-win guix-osx

teamcity awarded a token.Sep 4 2026, 16:07

Harbormaster completed remote builds in B38057: Diff 61183.Sep 4 2026, 16:52

Build Bitcoin ABC Diffs / Diff Testing (ai-review) passed.
CodeRabbit Review

Diff : committed changes only
Compare : HEAD → master
Directory : work
────────────────────────────────────────

(\(\
(• .•) Merge conflicts fear my conflict-resolution skills.

────────────────────────────────────────
Review complete
No findings ✔

10 files reviewed:

contrib/guix/guix-build
contrib/guix/libexec/build.sh
contrib/guix/libexec/prelude.bash
contrib/guix/manifest.scm
contrib/guix/patches/gcc-ssa-generation.patch
contrib/guix/patches/lief-scikit-0-9.patch
contrib/guix/patches/oscrypto-hard-code-openssl.patch
contrib/guix/patches/winpthreads-remap-guix-store.patch
contrib/guix/symbol-check.py
contrib/utils/install-dependencies-bookworm.sh

────────────────────────────────────────

Build Bitcoin ABC Diffs / Diff Testing (guix-osx) failed.

Tail of the build log:

-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/bitcoin-cli
/home/bitcoinabc/.guix-profile/bin/strip: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/bitcoin-cli: file format not recognized
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/bitcoin-tx
/home/bitcoinabc/.guix-profile/bin/strip: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/bitcoin-tx: file format not recognized
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/bitcoind
/home/bitcoinabc/.guix-profile/bin/strip: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/bitcoind: file format not recognized
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/MacOS
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/MacOS/BitcoinABC-Qt
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/Resources
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/Resources/bitcoin.icns
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/Resources/Base.lproj
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/Resources/Base.lproj/InfoPlist.strings
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/Resources/Base.lproj/InfoPlist.strings/InfoPlist.strings
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/Resources/empty.lproj
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/BitcoinABC-Qt.app/Contents/Info.plist
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/iguana
/home/bitcoinabc/.guix-profile/bin/strip: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/iguana: file format not recognized
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/proto
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/proto/chronik.proto
-- Installing: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/proof-manager-cli
[0/13] Preparing native build...
-- Looking for __builtin_clz
-- Looking for __builtin_clz - found
-- Looking for __builtin_ctz
-- Looking for __builtin_ctz - found
-- Looking for __builtin_ctzl
-- Looking for __builtin_ctzl - found
-- Looking for __builtin_ctzll
-- Looking for __builtin_ctzll - found
-- Looking for __builtin_popcount
-- Looking for __builtin_popcount - found
-- Looking for __builtin_saddll_overflow
-- Looking for __builtin_saddll_overflow - found
-- Looking for __builtin_ssubll_overflow
-- Looking for __builtin_ssubll_overflow - found
-- Configuring done (1.1s)
-- Generating done (0.2s)
-- Build files have been written to: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/native
[1/13] cd /bitcoin/chronik/chronik-lib && /gnu/store/bcm8is7b1vpqdxwn7ik37hyllimhwp0l-cmake-minimal-3.31.10/bin/cmake -E env "CFLAGS=-isysroot/bitcoin/depends/SDKs/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers -nostdlibinc -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711 -nostdlibinc -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711 -fuse-ld=lld" "CXXFLAGS=-isysroot/bitcoin/depends/SDKs/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers -nostdlibinc -iwithsysroot/usr/include/c++/v1 -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711 -nostdlibinc -iwithsysroot/usr/include/c++/v1 -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711" CC_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/clang CXX_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/clang++ AR_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/ar CORROSION_BUILD_DIR=/bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/chronik CARGO_BUILD_RUSTC=/home/bitcoinabc/.rustup/toolchains/1.87.0-x86_64-unknown-linux-gnu/bin/rustc /home/bitcoinabc/.rustup/toolchains/1.87.0-x86_64-unknown-linux-gnu/bin/cargo rustc --lib --target=x86_64-apple-darwin --package chronik_lib --manifest-path /bitcoin/chronik/chronik-lib/Cargo.toml --target-dir /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/./cargo/build --release --locked -- -Cdefault-linker-libraries=yes -Clink-args=--target=x86_64-apple-darwin
warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   /bitcoin/modules/avalanche-lib-wasm/Cargo.toml
workspace: /bitcoin/Cargo.toml
warning: virtual workspace defaulting to `resolver = "1"` despite one or more workspace members being on edition 2021 which implies `resolver = "2"`
note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest
note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest
note: for more details see https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions
    Finished `release` profile [optimized] target(s) in 0.15s
[2/13] Building native src/secp256k1/precompute_ecmult
ninja: no work to do.
[3/13] Running utility command for _cargo-build_chronik_lib
[4/7] Building native src/secp256k1/precompute_ecmult_gen
ninja: no work to do.
[6/7] Generating stripped/BitcoinABC-Qt.app
FAILED: [code=1] src/qt/stripped/BitcoinABC-Qt.app /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/src/qt/stripped/BitcoinABC-Qt.app 
cd /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/src/qt && /gnu/store/bcm8is7b1vpqdxwn7ik37hyllimhwp0l-cmake-minimal-3.31.10/bin/cmake -E copy_directory /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/src/qt/BitcoinABC-Qt.app /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/src/qt/stripped/BitcoinABC-Qt.app && /home/bitcoinabc/.guix-profile/bin/strip /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/src/qt/stripped/BitcoinABC-Qt.app/Contents/MacOS/BitcoinABC-Qt
/home/bitcoinabc/.guix-profile/bin/strip: /bitcoin/distsrc-15342e9ac119-x86_64-apple-darwin/src/qt/stripped/BitcoinABC-Qt.app/Contents/MacOS/BitcoinABC-Qt: file format not recognized
ninja: build stopped: subcommand failed.
Build guix-osx failed with exit code 1

try setting CMAKE_STRIP (not sure why this diff changes the existing behavior, I can't figure out how the guix build previously found llvm-strip for osx)

@bot guix-osx

teamcity updated a token.Sep 7 2026, 05:59

Harbormaster completed remote builds in B38063: Diff 61194.Sep 7 2026, 06:18

Build Bitcoin ABC Diffs / Diff Testing (ai-review) passed.
CodeRabbit Review

Diff : committed changes only
Compare : HEAD → master
Directory : work
────────────────────────────────────────

(\(\
(• .•) All your bugs are belong to us.

────────────────────────────────────────────────────────────────────────

major [Stability & Availability]
→ ]8;;vscode://file//work/contrib/guix/libexec/build.sh:417contrib/guix/libexec/build.sh:417]8;;

Set CMAKE_STRIP during CMake configuration.

cmake --install accepts install-mode options, but it does not accept
-D cache definitions. This command can fail before installation. Add
-DCMAKE_STRIP=/usr/bin/llvm-strip to the configure command and remove it
from cmake --install.

────────────────────────────────────────
Review complete
1 finding ✔

Major 1

10 files reviewed:

contrib/guix/guix-build
contrib/guix/libexec/build.sh
contrib/guix/libexec/prelude.bash
contrib/guix/manifest.scm
contrib/guix/patches/gcc-ssa-generation.patch
contrib/guix/patches/lief-scikit-0-9.patch
contrib/guix/patches/oscrypto-hard-code-openssl.patch
contrib/guix/patches/winpthreads-remap-guix-store.patch
contrib/guix/symbol-check.py
contrib/utils/install-dependencies-bookworm.sh

────────────────────────────────────────

Print all AI prompts: coderabbit review --show-prompts

Build Bitcoin ABC Diffs / Diff Testing (guix-osx) failed.

Tail of the build log:

[8/12] Running security-check.py on bitcoin-wallet...
[9/12] Running security-check.py on iguana...
[10/12] Running security-check.py on bitcoin-cli...
[11/12] Running security-check.py on bitcoind...
[12/12] Running security-check.py on bitcoin-qt...
[0/21] Preparing native build...
-- Looking for __builtin_clz
-- Looking for __builtin_clz - found
-- Looking for __builtin_ctz
-- Looking for __builtin_ctz - found
-- Looking for __builtin_ctzl
-- Looking for __builtin_ctzl - found
-- Looking for __builtin_ctzll
-- Looking for __builtin_ctzll - found
-- Looking for __builtin_popcount
-- Looking for __builtin_popcount - found
-- Looking for __builtin_saddll_overflow
-- Looking for __builtin_saddll_overflow - found
-- Looking for __builtin_ssubll_overflow
-- Looking for __builtin_ssubll_overflow - found
-- Configuring done (1.0s)
-- Generating done (0.2s)
-- Build files have been written to: /bitcoin/distsrc-41cf0d93784b-x86_64-apple-darwin/native
[1/21] cd /bitcoin/chronik/chronik-lib && /gnu/store/bcm8is7b1vpqdxwn7ik37hyllimhwp0l-cmake-minimal-3.31.10/bin/cmake -E env "CFLAGS=-isysroot/bitcoin/depends/SDKs/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers -nostdlibinc -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711 -nostdlibinc -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711 -fuse-ld=lld" "CXXFLAGS=-isysroot/bitcoin/depends/SDKs/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers -nostdlibinc -iwithsysroot/usr/include/c++/v1 -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711 -nostdlibinc -iwithsysroot/usr/include/c++/v1 -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711" CC_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/clang CXX_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/clang++ AR_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/ar CORROSION_BUILD_DIR=/bitcoin/distsrc-41cf0d93784b-x86_64-apple-darwin/chronik CARGO_BUILD_RUSTC=/home/bitcoinabc/.rustup/toolchains/1.87.0-x86_64-unknown-linux-gnu/bin/rustc /home/bitcoinabc/.rustup/toolchains/1.87.0-x86_64-unknown-linux-gnu/bin/cargo rustc --lib --target=x86_64-apple-darwin --package chronik_lib --manifest-path /bitcoin/chronik/chronik-lib/Cargo.toml --target-dir /bitcoin/distsrc-41cf0d93784b-x86_64-apple-darwin/./cargo/build --release --locked -- -Cdefault-linker-libraries=yes -Clink-args=--target=x86_64-apple-darwin
warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   /bitcoin/modules/avalanche-lib-wasm/Cargo.toml
workspace: /bitcoin/Cargo.toml
warning: virtual workspace defaulting to `resolver = "1"` despite one or more workspace members being on edition 2021 which implies `resolver = "2"`
note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest
note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest
note: for more details see https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions
    Finished `release` profile [optimized] target(s) in 0.15s
[2/21] Building native src/secp256k1/precompute_ecmult
ninja: no work to do.
[3/21] Running utility command for _cargo-build_chronik_lib
[4/12] Building native src/secp256k1/precompute_ecmult_gen
ninja: no work to do.
[6/12] Running symbol-check.py on bitcoin-tx...
[7/12] Running symbol-check.py on bitcoin-cli...
[8/12] Running symbol-check.py on bitcoin-wallet...
[9/12] Running symbol-check.py on iguana...
[10/12] Running symbol-check.py on bitcoin-seeder...
[11/12] Running symbol-check.py on bitcoind...
[12/12] Running symbol-check.py on bitcoin-qt...
Unknown argument -DCMAKE_STRIP=/usr/bin/llvm-strip
Usage: cmake --install <dir> [options]
Options:
  <dir>              = Project binary directory to install.
  --config <cfg>     = For multi-configuration tools, choose <cfg>.
  --component <comp> = Component-based install. Only install <comp>.
  --default-directory-permissions <permission> 
     Default install permission. Use default permission <permission>.
  -j <jobs> --parallel <jobs>
     Build in parallel using the given number of jobs. 
     The CMAKE_INSTALL_PARALLEL_LEVEL environment variable
     specifies a default parallel level when this option is not given.
  --prefix <prefix>  = The installation prefix CMAKE_INSTALL_PREFIX.
  --strip            = Performing install/strip.
  -v --verbose       = Enable verbose output.
Build guix-osx failed with exit code 1

try something smarter to find llvm-strip

@bot guix-osx

teamcity updated a token.Sep 7 2026, 08:23

Build Bitcoin ABC Diffs / Diff Testing (guix-osx) failed.

Tail of the build log:

-- Looking for O_CLOEXEC
-- Looking for O_CLOEXEC - found
-- Performing Test HAVE_CLANG_THREAD_SAFETY
-- Performing Test HAVE_CLANG_THREAD_SAFETY - Success
-- Performing Test HAVE_CXX17_HAS_INCLUDE
-- Performing Test HAVE_CXX17_HAS_INCLUDE - Success
-- Performing Test have_C__Wno_conditional_uninitialized
-- Performing Test have_C__Wno_conditional_uninitialized - Success
-- Performing Test have_C__Wno_maybe_uninitialized
-- Performing Test have_C__Wno_maybe_uninitialized - Failed
-- Performing Test have_CXX__Wno_conditional_uninitialized
-- Performing Test have_CXX__Wno_conditional_uninitialized - Success
-- Performing Test have_CXX__Wno_maybe_uninitialized
-- Performing Test have_CXX__Wno_maybe_uninitialized - Failed
-- Performing Test have_CXX__Wno_suggest_override
-- Performing Test have_CXX__Wno_suggest_override - Success
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success
-- Found Threads: TRUE
-- Performing Test have_C__Wno_sign_compare
-- Performing Test have_C__Wno_sign_compare - Success
-- Performing Test have_CXX__Wno_sign_compare
-- Performing Test have_CXX__Wno_sign_compare - Success
-- Performing Test have_C__pedantic
-- Performing Test have_C__pedantic - Success
-- Performing Test have_C__Wno_long_long
-- Performing Test have_C__Wno_long_long - Success
-- Performing Test have_C__Wno_overlength_strings
-- Performing Test have_C__Wno_overlength_strings - Success
-- Performing Test have_C__Wno_unused_function
-- Performing Test have_C__Wno_unused_function - Success
-- Performing Test have_C__Wundef
-- Performing Test have_C__Wundef - Success
-- Performing Test have_C__Wreserved_identifier
-- Performing Test have_C__Wreserved_identifier - Success
-- Performing Test USE_ASM_X86_64
-- Performing Test USE_ASM_X86_64 - Success
-- Performing Test have_linker__Wl___no_undefined
-- Performing Test have_linker__Wl___no_undefined - Failed
-- Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE) 
-- Found Event component event: /bitcoin/depends/x86_64-apple-darwin/lib/libevent.a
-- Found Event: /bitcoin/depends/x86_64-apple-darwin/include (found suitable version "99.99.99", minimum required is "2.1.8") found components: event
-- Found Boost component headers: /bitcoin/depends/x86_64-apple-darwin/include (found suitable version "1.81.0", minimum required is "1.64")
-- Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE) 
-- Found Event component pthreads: /bitcoin/depends/x86_64-apple-darwin/lib/libevent_pthreads.a
-- Found Event: /bitcoin/depends/x86_64-apple-darwin/include (found suitable version "99.99.99", minimum required is "2.1.8") found components: pthreads
-- Performing Test fuzz_target_builds_without_main_fuzz
-- Performing Test fuzz_target_builds_without_main_fuzz - Failed
-- Configuring native build in /bitcoin/source_package/native
-- Configuring done (14.1s)
-- Generating done (0.2s)
-- Build files have been written to: /bitcoin/source_package
[0/1] Run CPack packaging tool for source...
CPack: Create package using TGZ
CPack: Install projects
CPack: - Install directory: /bitcoin
CPack: Create package
CPack: - package: /bitcoin/source_package/bitcoin-abc-0.33.11.tar.gz generated.
/bitcoin
Build guix-osx failed with exit code 1

Harbormaster completed remote builds in B38067: Diff 61199.Sep 7 2026, 08:47

Build Bitcoin ABC Diffs / Diff Testing (ai-review) passed.
CodeRabbit Review

Diff : committed changes only
Compare : HEAD → master
Directory : work
────────────────────────────────────────

(\(\
(• .•) First, solve the problem. Then, write the code. - John Johnson

────────────────────────────────────────
Review complete
No findings ✔

10 files reviewed:

contrib/guix/guix-build
contrib/guix/libexec/build.sh
contrib/guix/libexec/prelude.bash
contrib/guix/manifest.scm
contrib/guix/patches/gcc-ssa-generation.patch
contrib/guix/patches/lief-scikit-0-9.patch
contrib/guix/patches/oscrypto-hard-code-openssl.patch
contrib/guix/patches/winpthreads-remap-guix-store.patch
contrib/guix/symbol-check.py
contrib/utils/install-dependencies-bookworm.sh

────────────────────────────────────────

this seems to work: add set(CMAKE_STRIP to the toolchain file

@bot guix-osx

teamcity updated a token.Mon, Sep 7, 09:43

the build completes and the files have the expected size, but I see a warning so we should probably test the binary:

[0/3] cd /bitcoin/apps/proof-manager-cli && /gnu/store/ydikjqbjjssm7drh4kc8yh6nxjr9yq7r-cmake-minimal-3.31.10/bin/cmake -E env "CFLAGS=-isysroot/bitcoin/depends/SDKs/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers -nostdlibinc -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711 -nostdlibinc -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks -mlinker-version=711" "RUSTFLAGS=-Clink-arg=-Wl,-no_adhoc_codesign -Clink-arg=-fuse-ld=lld -Clink-arg=-Wl,-no_adhoc_codesign -Clink-arg=-fuse-ld=lld -Clink-arg=--target=x86_64-apple-darwin -Clink-arg=-fuse-ld=lld -Clink-arg=-isysroot/bitcoin/depends/SDKs/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers" CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER=/home/bitcoinabc/.guix-profile/bin/clang CC_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/clang CXX_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/clang++ AR_x86_64_apple_darwin=/home/bitcoinabc/.guix-profile/bin/ar CORROSION_BUILD_DIR=/bitcoin/distsrc-3406180e404d-x86_64-apple-darwin/apps/proof-manager-cli CARGO_BUILD_RUSTC=/home/bitcoinabc/.rustup/toolchains/1.87.0-x86_64-unknown-linux-gnu/bin/rustc /home/bitcoinabc/.rustup/toolchains/1.87.0-x86_64-unknown-linux-gnu/bin/cargo rustc --bin=proof-manager-cli --target=x86_64-apple-darwin --package proof-manager-cli --manifest-path /bitcoin/apps/proof-manager-cli/Cargo.toml --target-dir /bitcoin/distsrc-3406180e404d-x86_64-apple-darwin/./cargo/build --profile=release --locked -- -Cdefault-linker-libraries=yes
warning: profiles for the non root package will be ignored, specify profiles at the workspace root:
package:   /bitcoin/modules/avalanche-lib-wasm/Cargo.toml
workspace: /bitcoin/Cargo.toml
warning: virtual workspace defaulting to `resolver = "1"` despite one or more workspace members being on edition 2021 which implies `resolver = "2"`
note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest
note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest
note: for more details see https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions
warning: stripping debug info with `rust-objcopy` failed: exit status: 127
  |
  = note: rust-objcopy: error while loading shared libraries: libLLVM.so.20.1-rust-1.87.0-stable: cannot open shared object file: No such file or directory


warning: `avalanche-lib-wasm` (lib) generated 1 warning
warning: `proof-manager-cli` (bin "proof-manager-cli") generated 1 warning (1 duplicate)
    Finished `release` profile [optimized] target(s) in 0.10s
[2/3] Running utility command for _cargo-build_proof-manager-cli
[3/3] Installing component proof-manager-cli
-- Install configuration: "RelWithDebInfo"
-- Install component: "proof-manager-cli"
-- Installing: /bitcoin/distsrc-3406180e404d-x86_64-apple-darwin/installed/bitcoin-abc-0.33.11/bin/proof-manager-cli
/bitcoin/distsrc-3406180e404d-x86_64-apple-darwin/installed /bitcoin/distsrc-3406180e404d-x86_64-apple-darwin
/bitcoin/distsrc-3406180e404d-x86_64-apple-darwin
/outdir-base/x86_64-apple-darwin /outdir-base
/outdir-base
8b06a98f35fb0271499f396fc9f6fd933005093915f7a280becea2c5a1c628fa  bitcoin-abc-0.33.11-osx-unsigned.tar.gz
5c574fddd67800e24bee286620bcea8d3ddfd187e6b786691d5e20eb55d6966b  bitcoin-abc-0.33.11-osx-unsigned.zip
1596c64ab38ada87a5cc38e6ab1a4f7f56bf2962af2afa695a7025e7a5d4a2cc  bitcoin-abc-0.33.11-x86_64-apple-darwin.tar.gz
ad5da0c197ab355adad5404a7838179e8f3696a59dbc06144fdde2d044ce91b4  src/bitcoin-abc-0.33.11.tar.gz
---8<----------------------8<------------------------8<---
8b06a98f35fb0271499f396fc9f6fd933005093915f7a280becea2c5a1c628fa  bitcoin-abc-0.33.11-osx-unsigned.tar.gz
5c574fddd67800e24bee286620bcea8d3ddfd187e6b786691d5e20eb55d6966b  bitcoin-abc-0.33.11-osx-unsigned.zip
1596c64ab38ada87a5cc38e6ab1a4f7f56bf2962af2afa695a7025e7a5d4a2cc  bitcoin-abc-0.33.11-x86_64-apple-darwin.tar.gz
ad5da0c197ab355adad5404a7838179e8f3696a59dbc06144fdde2d044ce91b4  src/bitcoin-abc-0.33.11.tar.gz
---8<----------------------8<------------------------8<---

the rust-objcopy warning is not related to this diff, it already appears on master

PiRK added inline comments.Mon, Sep 7, 10:13

cmake/platforms/OSX.cmake
49 ↗	(On Diff #61203)	will add a newline

Build Bitcoin ABC Diffs / Diff Testing (ai-review) passed.
CodeRabbit Review

Diff : committed changes only
Compare : HEAD → master
Directory : work
────────────────────────────────────────

(\(\
(• .•) These comments are outdated enough to vote.

────────────────────────────────────────
Review complete
No findings ✔

11 files reviewed:

cmake/platforms/OSX.cmake
contrib/guix/guix-build
contrib/guix/libexec/build.sh
contrib/guix/libexec/prelude.bash
contrib/guix/manifest.scm
contrib/guix/patches/gcc-ssa-generation.patch
contrib/guix/patches/lief-scikit-0-9.patch
contrib/guix/patches/oscrypto-hard-code-openssl.patch
contrib/guix/patches/winpthreads-remap-guix-store.patch
contrib/guix/symbol-check.py

... and 1 more file
────────────────────────────────────────

Harbormaster completed remote builds in B38069: Diff 61203.Mon, Sep 7, 10:27

newline

PiRK added a child revision: D20546: cmake: use the tar.gz rather than git clone for corrosion.Mon, Sep 7, 10:41

Build Bitcoin ABC Diffs / Diff Testing (ai-review) passed.
CodeRabbit Review

Diff : committed changes only
Compare : HEAD → master
Directory : work
────────────────────────────────────────

(\(\
(• .•) A CodeRabbit review a day keeps the merge cop away: https://x.com/ThePrimeagen/status/1986151686839116209

────────────────────────────────────────
Review complete
No findings ✔

11 files reviewed:

cmake/platforms/OSX.cmake
contrib/guix/guix-build
contrib/guix/libexec/build.sh
contrib/guix/libexec/prelude.bash
contrib/guix/manifest.scm
contrib/guix/patches/gcc-ssa-generation.patch
contrib/guix/patches/lief-scikit-0-9.patch
contrib/guix/patches/oscrypto-hard-code-openssl.patch
contrib/guix/patches/winpthreads-remap-guix-store.patch
contrib/guix/symbol-check.py

... and 1 more file
────────────────────────────────────────

Harbormaster completed remote builds in B38070: Diff 61204.Mon, Sep 7, 10:56

@bot guix-linux guix-win guix-osx

contrib/guix/libexec/build.sh
417 ↗	(On Diff #61204)	what version do we have now ?

teamcity updated a token.Mon, Sep 7, 20:23

@bot guix-linux guix-win guix-osx

teamcity updated a token.Mon, Sep 7, 20:24

Fabien accepted this revision.Tue, Sep 8, 07:02

This revision is now accepted and ready to land.Tue, Sep 8, 07:02

PiRK added inline comments.Tue, Sep 8, 10:18

contrib/guix/libexec/build.sh
417 ↗	(On Diff #61204)	3.31.10

Closed by commit rABC5dd2fd9d8c54: guix: update time-machine to c5eee3336cc1d10a3cc1c97fde2809c3451624d3. · Explain WhyTue, Sep 8, 10:18

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABC5dd2fd9d8c54: guix: update time-machine to c5eee3336cc1d10a3cc1c97fde2809c3451624d3.

guix: update time-machine to c5eee3336cc1d10a3cc1c97fde2809c3451624d3
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 61238

cmake/platforms/OSX.cmake

contrib/guix/guix-build

contrib/guix/libexec/build.sh

contrib/guix/libexec/prelude.bash

contrib/guix/manifest.scm

contrib/guix/patches/gcc-ssa-generation.patch

contrib/guix/patches/lief-scikit-0-9.patch

contrib/guix/patches/oscrypto-hard-code-openssl.patch

contrib/guix/patches/winpthreads-remap-guix-store.patch

contrib/guix/symbol-check.py

contrib/utils/install-dependencies-bookworm.sh

guix: update time-machine to c5eee3336cc1d10a3cc1c97fde2809c3451624d3ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 61238

cmake/platforms/OSX.cmake

contrib/guix/guix-build

contrib/guix/libexec/build.sh

contrib/guix/libexec/prelude.bash

contrib/guix/manifest.scm

contrib/guix/patches/gcc-ssa-generation.patch

contrib/guix/patches/lief-scikit-0-9.patch

contrib/guix/patches/oscrypto-hard-code-openssl.patch

contrib/guix/patches/winpthreads-remap-guix-store.patch

contrib/guix/symbol-check.py

contrib/utils/install-dependencies-bookworm.sh

guix: update time-machine to c5eee3336cc1d10a3cc1c97fde2809c3451624d3
ClosedPublic
Actions

Revision Contents
Changeset List