Skip to content

Build: Update bde and ntf-core to the latest version. #1242

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.

Sign up for GitHub

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
hallfox merged 1 commit into from
Apr 2, 2026
Merged

Build: Update bde and ntf-core to the latest version. #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bin/build-darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ mkdir -p "${DIR_INSTALL}"

# :: Clone dependencies :::::::::::::::::::::::::::::::::::::::::::::::::::::::
if [ ! -d "${DIR_THIRDPARTY}/bde-tools" ]; then
git clone --depth 1 --branch 4.28.0.0 https://github.com/bloomberg/bde-tools "${DIR_THIRDPARTY}/bde-tools"
git clone --depth 1 --branch 4.35.0.0 https://github.com/bloomberg/bde-tools "${DIR_THIRDPARTY}/bde-tools"
fi
if [ ! -d "${DIR_THIRDPARTY}/bde" ]; then
git clone --depth 1 --branch 4.28.0.0 https://github.com/bloomberg/bde.git "${DIR_THIRDPARTY}/bde"
git clone --depth 1 --branch 4.35.0.0 https://github.com/bloomberg/bde.git "${DIR_THIRDPARTY}/bde"
fi
if [ ! -d "${DIR_THIRDPARTY}/ntf-core" ]; then
git clone --depth 1 --branch 2.6.10 https://github.com/bloomberg/ntf-core.git "${DIR_THIRDPARTY}/ntf-core"
git clone --depth 1 --branch 2.6.11 https://github.com/bloomberg/ntf-core.git "${DIR_THIRDPARTY}/ntf-core"
fi

# :: Install required packages ::::::::::::::::::::::::::::::::::::::::::::::::
Expand All @@ -118,7 +118,7 @@ if [ ! -e "${DIR_BUILD}/bde/.complete" ]; then
# shellcheck disable=SC2030
export CXXFLAGS="-w" CFLAGS="-w"
cd "${DIR_THIRDPARTY}/bde"
eval "$(bbs_build_env -p clang -u opt_64_cpp23 -b "${DIR_BUILD}/bde" -i "${DIR_INSTALL}")"
eval "$(bbs_build_env -p clang -u opt_64_cpp17 -b "${DIR_BUILD}/bde" -i "${DIR_INSTALL}")"
bbs_build configure --prefix="${DIR_INSTALL}"
bbs_build build --prefix="${DIR_INSTALL}"
bbs_build install --install_dir="/" --prefix="${DIR_INSTALL}"
Expand All @@ -143,7 +143,7 @@ if [ ! -e "${DIR_BUILD}/ntf/.complete" ]; then
--with-zlib \
--without-zstd \
--without-lz4 \
--ufid opt_64_cpp23
--ufid opt_64_cpp17
make -j 16
make install
)
Expand All @@ -162,7 +162,7 @@ CMAKE_OPTIONS=(
-DCMAKE_MODULE_PATH="${DIR_THIRDPARTY}/bde-tools/cmake;${DIR_THIRDPARTY}/bde-tools/BdeBuildSystem"
-DCMAKE_PREFIX_PATH="${DIR_INSTALL}"
-DCMAKE_TOOLCHAIN_FILE="${DIR_THIRDPARTY}/bde-tools/BdeBuildSystem/toolchains/darwin/clang-default.cmake"
-DCMAKE_CXX_STANDARD=23
-DCMAKE_CXX_STANDARD=17
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DFLEX_ROOT="${FLEX_ROOT}")

Expand Down
40 changes: 20 additions & 20 deletions bin/build-fuzz.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ export FUZZER_FLAG="fuzzer-no-link"
# :: Clone dependencies :::::::::::::::::::::::::::::::::::::::::::::::::::::::

if [ ! -d "${DIR_THIRDPARTY}/bde-tools" ]; then
git clone --depth 1 --branch 4.28.0.0 https://github.com/bloomberg/bde-tools "${DIR_THIRDPARTY}/bde-tools"
git clone --depth 1 --branch 4.35.0.0 https://github.com/bloomberg/bde-tools "${DIR_THIRDPARTY}/bde-tools"
fi
if [ ! -d "${DIR_THIRDPARTY}/bde" ]; then
git clone --depth 1 --branch 4.28.0.0 https://github.com/bloomberg/bde.git "${DIR_THIRDPARTY}/bde"
git clone --depth 1 --branch 4.35.0.0 https://github.com/bloomberg/bde.git "${DIR_THIRDPARTY}/bde"
fi
if [ ! -d "${DIR_THIRDPARTY}/ntf-core" ]; then
git clone --depth 1 --branch 2.6.10 https://github.com/bloomberg/ntf-core.git "${DIR_THIRDPARTY}/ntf-core"
git clone --depth 1 --branch 2.6.11 https://github.com/bloomberg/ntf-core.git "${DIR_THIRDPARTY}/ntf-core"
fi

# :: Install required packages ::::::::::::::::::::::::::::::::::::::::::::::::
Expand All @@ -44,9 +44,9 @@ fi
PATH="${DIR_THIRDPARTY}/bde-tools/bin:$PATH"
if [ ! -e "${DIR_BUILD}/bde/.complete" ]; then
pushd "${DIR_THIRDPARTY}/bde" || exit
eval "$(bbs_build_env -p clang -u dbg_64_safe_cpp20 -b "${DIR_BUILD}/bde" -i "${DIR_INSTALL}")"
eval "$(bbs_build_env -p clang -u dbg_64_safe_cpp23 -b "${DIR_BUILD}/bde" -i "${DIR_INSTALL}")"
bbs_build configure --prefix="${DIR_INSTALL}" \
--toolchain "${TOOLCHAIN_PATH}"
--toolchain "${TOOLCHAIN_PATH}"
bbs_build build --prefix="${DIR_INSTALL}"
bbs_build install --install_dir="/" --prefix="${DIR_INSTALL}"
popd || exit
Expand All @@ -56,29 +56,29 @@ fi
if [ ! -e "${DIR_BUILD}/ntf/.complete" ]; then
# Build and install NTF
pushd "${DIR_THIRDPARTY}/ntf-core" || exit
./configure --prefix "${DIR_INSTALL}" \
--output "${DIR_BUILD}/ntf" \
--without-warnings-as-errors \
--without-usage-examples \
--without-applications \
--with-zlib \
--without-zstd \
--without-lz4 \
--ufid "dbg_64_safe_cpp20" \
--toolchain "${TOOLCHAIN_PATH}"
./configure --prefix "${DIR_INSTALL}" \
--output "${DIR_BUILD}/ntf" \
--without-warnings-as-errors \
--without-usage-examples \
--without-applications \
--with-zlib \
--without-zstd \
--without-lz4 \
--ufid "dbg_64_safe_cpp23" \
--toolchain "${TOOLCHAIN_PATH}"
make -j 16
make install
popd || exit
touch "${DIR_BUILD}/ntf/.complete"
fi

export FUZZER_FLAG="fuzzer"
CMAKE_OPTIONS=(\
-DCMAKE_INSTALL_PREFIX="${DIR_INSTALL}" \
-DCMAKE_MODULE_PATH="${DIR_THIRDPARTY}/bde-tools/cmake;${DIR_THIRDPARTY}/bde-tools/BdeBuildSystem" \
-DCMAKE_PREFIX_PATH="${DIR_INSTALL}" \
CMAKE_OPTIONS=(
-DCMAKE_INSTALL_PREFIX="${DIR_INSTALL}"
-DCMAKE_MODULE_PATH="${DIR_THIRDPARTY}/bde-tools/cmake;${DIR_THIRDPARTY}/bde-tools/BdeBuildSystem"
-DCMAKE_PREFIX_PATH="${DIR_INSTALL}"
-DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_PATH}")

PKG_CONFIG_PATH="${DIR_INSTALL}/lib64/pkgconfig:${DIR_INSTALL}/lib/pkgconfig:$(pkg-config --variable pc_path pkg-config)" \
cmake --preset fuzz-tests -B "${DIR_BUILD}/blazingmq" -S "${DIR_ROOT}" "${CMAKE_OPTIONS[@]}"
cmake --preset fuzz-tests -B "${DIR_BUILD}/blazingmq" -S "${DIR_ROOT}" "${CMAKE_OPTIONS[@]}"
cmake --build "${DIR_BUILD}/blazingmq" --parallel 16 --target fuzztests
6 changes: 3 additions & 3 deletions bin/build-ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ mkdir -p "${DIR_INSTALL}"
# :: Clone dependencies :::::::::::::::::::::::::::::::::::::::::::::::::::::::

if [ ! -d "${DIR_THIRDPARTY}/bde-tools" ]; then
git clone --depth 1 --branch 4.28.0.0 https://github.com/bloomberg/bde-tools "${DIR_THIRDPARTY}/bde-tools"
git clone --depth 1 --branch 4.35.0.0 https://github.com/bloomberg/bde-tools "${DIR_THIRDPARTY}/bde-tools"
fi
if [ ! -d "${DIR_THIRDPARTY}/bde" ]; then
git clone --depth 1 --branch 4.28.0.0 https://github.com/bloomberg/bde.git "${DIR_THIRDPARTY}/bde"
git clone --depth 1 --branch 4.35.0.0 https://github.com/bloomberg/bde.git "${DIR_THIRDPARTY}/bde"
fi
if [ ! -d "${DIR_THIRDPARTY}/ntf-core" ]; then
git clone --depth 1 --branch 2.6.10 https://github.com/bloomberg/ntf-core.git "${DIR_THIRDPARTY}/ntf-core"
git clone --depth 1 --branch 2.6.11 https://github.com/bloomberg/ntf-core.git "${DIR_THIRDPARTY}/ntf-core"
fi
# prometheus-cpp and its dependency for the plugin
if [ "${BUILD_PROMETHEUS}" == true ]; then
Expand Down
15 changes: 11 additions & 4 deletions docker/build_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ fetch_git() {
}

fetch_deps() {
fetch_git bloomberg bde-tools 4.28.0.0
fetch_git bloomberg bde 4.28.0.0
fetch_git bloomberg ntf-core 2.6.10
fetch_git bloomberg bde-tools 4.35.0.0
fetch_git bloomberg bde 4.35.0.0
fetch_git bloomberg ntf-core 2.6.11
}

configure() {
Expand All @@ -92,6 +92,13 @@ build_bde() {
}

build_ntf() {
local standard="$CXX_STANDARD"
if [[ "$CXX_STANDARD" == "cpp03" ]]; then
# NTF doesn't correctly translate cpp03 to 98 in its toolchain, so we have to
# pass it cpp98 explicitly.
standard="cpp98"
fi

pushd srcs/ntf-core
./configure \
--keep \
Expand All @@ -102,7 +109,7 @@ build_ntf() {
--with-zlib \
--without-zstd \
--without-lz4 \
--ufid "opt_64_$CXX_STANDARD"
--ufid "opt_64_$standard"
make -j8
make install
popd
Expand Down
Loading