Skip to content

fix(build): Implement workaround to remove duplicate rpaths on macOS#9

Merged
10d9e merged 2 commits intomainfrom
fix/patch-rpath-bug-in-macos
Feb 25, 2026
Merged

fix(build): Implement workaround to remove duplicate rpaths on macOS#9
10d9e merged 2 commits intomainfrom
fix/patch-rpath-bug-in-macos

Conversation

@10d9e
Copy link
Copy Markdown
Owner

@10d9e 10d9e commented Feb 17, 2026

This is a known Zig issue: ziglang/zig#24349

Added a helper function to clean up duplicate LC_RPATH entries caused by Zig's build system when linking multiple libraries. This temporary fix utilizes install_name_tool to ensure proper execution of binaries and is necessary until the underlying issue is resolved in Zig. Adjustments are made for OpenSSL installations, with a note for potential path modifications.

This is a known Zig issue: ziglang/zig#24349

Added a helper function to clean up duplicate LC_RPATH entries caused by Zig's build system when linking multiple libraries. This temporary fix utilizes `install_name_tool` to ensure proper execution of binaries and is necessary until the underlying issue is resolved in Zig. Adjustments are made for OpenSSL installations, with a note for potential path modifications.
@10d9e 10d9e requested a review from garyschulte February 17, 2026 14:07
@10d9e 10d9e changed the title feat: Implement workaround to remove duplicate rpaths on macOS fix: Implement workaround to remove duplicate rpaths on macOS Feb 17, 2026
Updated the build process to include additional cleanup steps for duplicate rpaths in installed binaries. This includes outputting a warning about the workaround for a known Zig issue and ensuring that the installed binaries are cleaned after installation. The changes also modify the Makefile to reflect the new installation command and cleanup logic, improving the overall build reliability on macOS.
@10d9e 10d9e changed the title fix: Implement workaround to remove duplicate rpaths on macOS fix(build): Implement workaround to remove duplicate rpaths on macOS Feb 17, 2026
@10d9e 10d9e merged commit c547c55 into main Feb 25, 2026
5 checks passed
garyschulte pushed a commit to garyschulte/zevm that referenced this pull request Mar 24, 2026
* feat: add BPO1 and BPO2 hardfork support

Add BPO1 (Blob Parameter Only fork 1, EIP-7892) and BPO2 SpecId variants
between Osaka and Amsterdam, with corresponding blob fraction and max blob
count constants.

- Add `bpo1` and `bpo2` to `SpecId` enum (between osaka and amsterdam)
- Add `HardforkName.BPO1`/`BPO2` string constants
- Add `specIdFromString`/`specIdToString` mappings for BPO1/BPO2
- Add `BLOB_BASE_FEE_UPDATE_FRACTION_BPO1` (8346193) and `_BPO2` (11684671)
- Add `MAX_BLOB_NUMBER_PER_BLOCK_BPO1` (15) and `_BPO2` (21)
- Add `BLOB_BASE_FEE_UPDATE_FRACTION_CANCUN` alias for clarity
- Map bpo1/bpo2 to Osaka precompile set in `PrecompileSpecId`

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: wire BPO1/BPO2 blob fractions into blobBaseFeeUpdateFraction

The new bpo1/bpo2 SpecId variants were added but blobBaseFeeUpdateFraction
only checked for Prague, returning 3,338,477 for all post-Prague forks
instead of the correct values.

Cascade the spec check to return the correct fraction per fork:
- BPO2+:  11,684,671 (BLOB_BASE_FEE_UPDATE_FRACTION_BPO2)
- BPO1+:   8,346,193 (BLOB_BASE_FEE_UPDATE_FRACTION_BPO1)
- Osaka+:  5,007,716 (BLOB_BASE_FEE_UPDATE_FRACTION_OSAKA, EIP-7691)
- Cancun+: 3,338,477 (BLOB_BASE_FEE_UPDATE_FRACTION_CANCUN)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: activate EIP-7691 blob fraction at Prague instead of Osaka

BLOB_BASE_FEE_UPDATE_FRACTION_OSAKA (5007716) is renamed to
BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE since EIP-7691 activates at
Prague, not Osaka. The redundant Prague alias for the Cancun fraction
(3338477) is removed. blobBaseFeeUpdateFraction now branches on
.prague instead of .osaka.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant