Skip to content

Commit f4027ef

Browse files
authored
Merge branch 'master' into clang-tidy-workflow-2
2 parents c1bf32c + e285a03 commit f4027ef

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ endif (CMAKE_BUILD_TYPE_UPPER MATCHES COVERAGE)
6868
#### Dependencies ####
6969

7070
# BOOST
71-
set (_KEYVI_BOOST_LIBRARIES "program_options" "iostreams" "filesystem" "regex" "thread")
71+
set (_KEYVI_BOOST_LIBRARIES "program_options" "iostreams" "filesystem")
7272
set (_KEYVI_BOOST_LIBRARIES_TEST "unit_test_framework")
7373

7474
set(Boost_USE_STATIC_LIBS OFF)

docker/scripts/install_boost.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tar xzf boost.tar.gz
2424
cd "${BOOST_DIR}"
2525

2626
echo "Bootstrapping Boost..."
27-
./bootstrap.sh --without-libraries=graph_parallel,python
27+
./bootstrap.sh --with-libraries=system,program_options,iostreams,filesystem,test,interprocess,sort,container,process,format,lexical_cast
2828

2929
# Use nproc if available, otherwise default to 1
3030
if command -v nproc >/dev/null 2>&1; then
@@ -37,6 +37,6 @@ echo "Building and installing Boost with ${JOBS} jobs..."
3737
./b2 -j"${JOBS}" -d0 --prefix=/usr/local/ install
3838

3939
cd ..
40-
rm -rf "boost_*" boost.tar.gz
40+
rm -rf "${BOOST_DIR}" boost.tar.gz
4141

4242
echo "Boost ${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH} installed successfully."

docker/scripts/install_ccache.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ rm -rf "${CCACHE_DIR}" "${CCACHE_TAR}"
4646

4747
# --- Symlinks ---
4848
echo "Creating compiler symlinks for ccache..."
49-
for bin in gcc g++ cc c++ clang clang++; do
49+
for bin in gcc g++ cc c++; do
5050
if [ ! -e "/usr/local/bin/$bin" ]; then
5151
ln -s /usr/local/bin/ccache "/usr/local/bin/$bin" || true
5252
fi

0 commit comments

Comments
 (0)