Make Dockerfile.xrpld build against rippled newer than 3.3.x - #96
Merged
Merged
Conversation
rippled develop renamed CamelCase namespaces to snake_case (XRPLF/rippled#7933): beast::IP -> beast::ip and xrpl::BuildInfo -> xrpl::build_info. rippled-fuzzer (all branches) still uses the old spelling in four call sites, so building the fuzzer fails against develop and takes the whole `build xrpld` stage with it. Rewrite the fuzzer's references in the image, gated on the cloned xrpld actually declaring the new namespaces, so pre-rename refs (e.g. xrpld-private staging/3.3.x-private) build unchanged. The includes keep the BuildInfo.h filename, which the substitutions leave alone. develop is the only ref carrying Lending v1.1 (closed-ended vaults landed Aug 12, after the Aug 4 rename), so there is no commit with both the v1.1 fields and the old namespaces to pin instead.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Two build fixes that already exist on the unmerged #91 branch but not on
main. Both are needed for any xrpld ref newer thanstaging/3.3.x-private, and neither has anything to do with the lending work they are currently attached to.1.
XRPLD_NO_PATCH_NIX_BINARY=1on the fuzzer's conan install. rippled'scmake/PatchNixBinary.cmakeresolves the loader via${CMAKE_SOURCE_DIR}/bin/default-loader-path.sh, which is absent in conan's build folder (the recipe'sexports_sourceshas nobin/), andCOMMAND_ERROR_IS_FATALaborts configure. Observed against3.4.0-rc2on ripple/rippled-antithesis run 34240477121:Nothing is lost: that step builds libxrpl (
xrpld=False), a static archive with noPT_INTERP, and the shipped binaries are patchelf'd explicitly. Scoped to this step so the xrpld build itself keeps rippled CI's behaviour.2. Rewrite the fuzzer's pre-rename symbols. XRPLF/rippled#7933 moved
beast::IP→beast::ipandxrpl::BuildInfo→xrpl::build_info; rippled-fuzzer still uses the old spelling. The rewrite is gated on the cloned xrpld actually carrying the new names, so pre-rename refs build unchanged.Both were authored on
manasip/lending-v1_1-accounting(commits8416b05,46e55ea) and are lifted here verbatim so the release-line move does not depend on that PR landing.Does not address amendment activation for new Supported::No features —
generate_genesis.pystill needs the change that remains in #91.🤖 Generated with Claude Code