Hermes
95282572d3
RocksDB 10.10.1 (pinned for v6.2.4) writes '-std=c++20' into its installed rocksdb.pc Cflags. pkg-config then injects that flag into every Triangles translation unit. C++ units ignore the redundant flag, but C units (src/lz4/lz4.c) hit a fatal error: invalid argument '-std=c++XX' not allowed with 'C' from clang-15. The daemon build tolerated this as a warning, but the fuzz build (clang-15 + sanitizers) treated it as a hard error and the test-fuzz-smoke / test-fuzz-smoke-tx jobs failed in CI run #30744702062 at the 'Build fuzz_script' / 'Build transaction_deserialize_fuzz' step. The previous fix only stripped '-std=c++17' (a relic of the 8.x pin). This commit: - Replaces the literal flag with a regex covering -std=c++17, -std=c++20, -std=c++2b, and any future C++ standard RocksDB writes into its .pc Cflags. - Adds a post-edit assertion: if any '-std=c++' token survives, the script exits 1 with a clear error pointing at the offending line, so future upstream .pc-format changes fail loudly here instead of breaking the fuzz job downstream. CI run 30744702062 had 8/10 platform builds passing; only the two fuzz jobs failed at the same step, both with the C-file error. This is the v6.2.4 release blocker; re-running CI after this lands should turn the run green. Codex grade: A (urn:ump:guiqasdlhhi5d33rd5kps2foho47enyix3uwwfyrjm7iv7wta44q) Reasons: bash syntax + shellcheck clean; sed strips c++17/c++20/c++2b in mid- and end-of-line positions; clang-15 reproduces the upstream failure; post-edit sanity check fails loudly on regression.
125 lines
5.8 KiB
Bash
Executable File
125 lines
5.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# build-rocksdb.sh — Build and install a pinned RocksDB version for CI.
|
|
#
|
|
# Ubuntu 22.04's librocksdb-dev is 6.11.4 (the same version that bit
|
|
# DNS2 — see PR #10). Triangles requires RocksDB >= 7.4.0 for the XXH3
|
|
# per-block checksum used in modern smsgDB SST files; src/smessage.cpp's
|
|
# SecMsgDB::Open has a runtime quarantine fallback, but the build-time
|
|
# check in CMakeLists.txt refuses to configure against < 7.4.
|
|
#
|
|
# This script clones RocksDB at a pinned tag, builds only the shared
|
|
# library (fast), installs to /usr/local, and refreshes ldconfig.
|
|
# Triangles' CMake find_library probes /usr/local before /usr/lib so
|
|
# the just-built copy is picked up first.
|
|
#
|
|
# Pin policy (2026-08-02): chase the LATEST stable 10.x. "Match
|
|
# DNS2's system librocksdb" reasoning was abandoned: forward
|
|
# compatibility mattered more than byte-for-byte soname parity.
|
|
#
|
|
# Usage: sudo ./scripts/ci/build-rocksdb.sh
|
|
set -euo pipefail
|
|
|
|
# 2026-08-02 (Sami directive: "why wouldn't we be using the latest RocksDB"):
|
|
# Bumped 8.9.1 -> 10.10.1. Hetzner's Dropbox bootstrap snapshot's chain-DB
|
|
# SSTs are at format_version=7; that requires RocksDB >= 10.4.0 to read.
|
|
# 10.10.1 is the latest 10.x patch release and retains full read-compat
|
|
# for v5/v6 SSTs, so older chain DBs (DNS3's 8.9.1 chain DB, the snapshot
|
|
# fork) open cleanly on the new daemon. The daemon does not pin its own
|
|
# writes to v7 — see CHANGELOG for why.
|
|
# Pin policy: default version + commit are set together. Overriding
|
|
# ROCKSDB_VERSION alone is allowed (e.g. for testing); the commit line
|
|
# below is the canonical default for the matching release tag. When
|
|
# overriding the version, override the commit too — the validation
|
|
# below will fail loudly otherwise.
|
|
ROCKSDB_VERSION="${ROCKSDB_VERSION:-10.10.1}"
|
|
ROCKSDB_TAG="v${ROCKSDB_VERSION}"
|
|
# v10.10.1 commit (canonical pin for the tag above; override together
|
|
# with ROCKSDB_VERSION if testing a different release).
|
|
ROCKSDB_COMMIT="${ROCKSDB_COMMIT:-4595a5e95ae8525c42e172a054435782b3479c57}"
|
|
INSTALL_PREFIX="${INSTALL_PREFIX:-/usr/local}"
|
|
JOBS="${JOBS:-$(nproc)}"
|
|
|
|
WORKDIR="$(mktemp -d)"
|
|
trap 'rm -rf "$WORKDIR"' EXIT
|
|
|
|
echo ">>> Building RocksDB ${ROCKSDB_TAG} (${JOBS} jobs) into ${INSTALL_PREFIX}"
|
|
|
|
git clone --depth 1 --branch "${ROCKSDB_TAG}" \
|
|
https://github.com/facebook/rocksdb.git "${WORKDIR}/rocksdb"
|
|
|
|
cd "${WORKDIR}/rocksdb"
|
|
|
|
ACTUAL_COMMIT="$(git rev-parse HEAD)"
|
|
if [ "${ACTUAL_COMMIT}" != "${ROCKSDB_COMMIT}" ]; then
|
|
echo "!!! RocksDB ${ROCKSDB_TAG} resolved to ${ACTUAL_COMMIT}, expected ${ROCKSDB_COMMIT}" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Shared library only — Triangles links dynamically. Statically linking
|
|
# rocksdb.a would also work but balloons the daemon binary by ~50 MB.
|
|
make -j"${JOBS}" shared_lib PORTABLE=1 USE_RTTI=1 \
|
|
EXTRA_CXXFLAGS="-Wno-error=deprecated-declarations"
|
|
|
|
make install-shared PREFIX="${INSTALL_PREFIX}"
|
|
|
|
# Scrub the rocksdb.pc that install-shared just wrote. RocksDB's
|
|
# Makefile unconditionally appends `-isystem third-party/gtest-1.8.1/
|
|
# fused-src` to Cflags, which is a RELATIVE path baked in from the build
|
|
# directory. Modern CMake (>= 3.27) refuses to consume imported targets
|
|
# with non-existent relative paths in INTERFACE_INCLUDE_DIRECTORIES,
|
|
# so pkg_check_modules(rocksdb) on a Triangles configure errors out
|
|
# with: 'Imported target "PkgConfig::RocksDB" includes non-existent
|
|
# path "third-party/gtest-1.8.1/fused-src"'.
|
|
#
|
|
# Replace the bad flag with the absolute include dir so pkg-config
|
|
# consumers see a path that actually exists on disk.
|
|
PC_FILE="${INSTALL_PREFIX}/lib/pkgconfig/rocksdb.pc"
|
|
if [ -f "${PC_FILE}" ]; then
|
|
# Strip the -std=c++XX flag RocksDB writes into Cflags. The flag is
|
|
# for the rocksdb .cc files themselves, but pkg-config injects it
|
|
# into every Triangles translation unit — including C files like
|
|
# src/lz4/lz4.c, which clang refuses to compile with
|
|
# "invalid argument '-std=c++XX' not allowed with 'C'".
|
|
# RocksDB 8.x wrote -std=c++17; 10.x bumped to -std=c++20; 11.x is
|
|
# expected to use -std=c++2b. The regex below strips the whole
|
|
# family so this fix survives future bumps.
|
|
sed -i \
|
|
-e "s|-isystem third-party/gtest-1.8.1/fused-src|-I${INSTALL_PREFIX}/include|g" \
|
|
-e "s|-isystem \\\${prefix}/third-party/gtest-1.8.1/fused-src|-I${INSTALL_PREFIX}/include|g" \
|
|
-e 's|-std=c++[0-9a-z]\+ ||g' \
|
|
-e 's|-std=c++[0-9a-z]\+$||g' \
|
|
"${PC_FILE}"
|
|
# Sanity: any remaining -std=c++ token means a future RocksDB release
|
|
# wrote a new variant our regex didn't cover. Fail loudly so the CI
|
|
# fuzz job doesn't surprise us downstream — fix the regex here.
|
|
if grep -q -- '-std=c++' "${PC_FILE}"; then
|
|
echo "!!! rocksdb.pc still contains -std=c++ after stripping:" >&2
|
|
grep -- '-std=c++' "${PC_FILE}" >&2 || true
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
ldconfig
|
|
|
|
# Sanity: installed library should be on disk and registered with ldconfig.
|
|
# ldconfig strips the patch version from its output, so we check both:
|
|
# 1. File exists at the versioned path (definitive).
|
|
# 2. ldconfig shows a matching major.minor (sanity for runtime linker).
|
|
ROCKSDB_MAJOR_MINOR="${ROCKSDB_VERSION%.*}"
|
|
if [ ! -f "${INSTALL_PREFIX}/lib/librocksdb.so.${ROCKSDB_VERSION}" ]; then
|
|
echo "!!! librocksdb.so.${ROCKSDB_VERSION} not found at ${INSTALL_PREFIX}/lib/" >&2
|
|
ls -l "${INSTALL_PREFIX}/lib/librocksdb"* 2>&1 || true
|
|
exit 1
|
|
fi
|
|
if ! ldconfig -p | grep -q "librocksdb.so.${ROCKSDB_MAJOR_MINOR}"; then
|
|
echo "!!! ldconfig did not register librocksdb.so.${ROCKSDB_MAJOR_MINOR}" >&2
|
|
ldconfig -p | grep -i rocksdb >&2 || true
|
|
exit 1
|
|
fi
|
|
|
|
echo ">>> RocksDB ${ROCKSDB_TAG} installed to ${INSTALL_PREFIX}"
|
|
echo ">>> - library: ${INSTALL_PREFIX}/lib/librocksdb.so.${ROCKSDB_VERSION}"
|
|
echo ">>> - headers: ${INSTALL_PREFIX}/include/rocksdb/version.h"
|
|
ls -l "${INSTALL_PREFIX}/lib/librocksdb.so"* "${INSTALL_PREFIX}/include/rocksdb/version.h"
|