Added capability of building on debian 10

Oleg Samarin · Oleg Samarin · commit 82c37403643e · 2023-04-13T10:17:56.000+03:00
diff --git a/build-scripts/for-linux/build-on-linux.bash b/build-scripts/for-linux/build-on-linux.bash
@@ -27,7 +27,8 @@ APP_PRMS="\
   $CMAKE_VERSION_PRMS \
   -DFDB_RELEASE=$RELEASE_FLAG \
   -DGENERATE_DEBUG_PACKAGES=OFF \
-  -DUSE_LIBCXX=OFF \
+  -DUSE_LIBCXX=ON \
+  -DUSE_LD=LLD \
   -DSTATIC_LINK_LIBCXX=ON \
   -DENABLE_SIMULATION_TESTS=ON"
 
diff --git a/build-scripts/for-linux/prepare-debian-based-clang.sh b/build-scripts/for-linux/prepare-debian-based-clang.sh
@@ -5,9 +5,12 @@
 set -e
 
 sudo apt update
-RECENT_PKG=`apt search -o APT::Cache::Search::Version=1 '^clang-[0-9][0-9]$' | awk '{print $1;}' | sort | tail -n 1`
+RECENT_VERSION=` \
+  apt search -o APT::Cache::Search::Version=1 '^clang-[0-9]+$' \
+    | tr - ' ' | awk '{print $2;}' | sort -n  | tail -n 1`
 
-sudo DEBIAN_FRONTEND=noninteractive apt install -y $RECENT_PKG
+sudo DEBIAN_FRONTEND=noninteractive apt install -y \
+  $clang-$RECENT_VERSION libc++-$RECENT_VERSION-dev libc++abi-$RECENT_VERSION-dev 
 
 [ -e /usr/local/bin/clang ] || sudo ln -s `ls -1 /usr/bin/clang-[0-9]* | tail -n 1` /usr/local/bin/clang
 [ -e /usr/local/bin/clang++ ] || sudo ln -s `ls -1 /usr/bin/clang++-[0-9]* | tail -n 1` /usr/local/bin/clang++
diff --git a/build-scripts/for-linux/prepare-debian-based.bash b/build-scripts/for-linux/prepare-debian-based.bash
@@ -9,12 +9,13 @@ sudo apt update
 $BASE_DIR/prepare-debian-based-cmake.bash 3.24
 $BASE_DIR/prepare-debian-based-clang.sh
 $BASE_DIR/prepare-debian-based-jdk.bash
-$BASE_DIR/prepare-debian-based-libstdc.sh
+# $BASE_DIR/prepare-debian-based-libstdc.sh
 
 # make is necessary for building Jemalloc on Astra Linux
 
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
   git \
+  lld \
   mono-mcs \
   make \
   ninja-build \
@@ -35,4 +36,4 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
   libmono-system-runtime-serialization4.0-cil \
   libmono-system-xml-linq4.0-cil
 
-sudo pip install sphinx-bootstrap-theme
+sudo pip3 install sphinx-bootstrap-theme
diff --git a/flowbench/CMakeLists.txt b/flowbench/CMakeLists.txt
@@ -41,6 +41,8 @@ else()
     message(FATAL_ERROR "Build step for Benchmark has Failed. ${results}")
   endif()
   set(BENCHMARK_ENABLE_TESTING OFF)
+  # libc++ implicitly requires -pthread
+  set(CMAKE_CXX_FLAGS${VARIANT} "${CMAKE_CXX_FLAGS} -pthread")
   add_subdirectory(
     ${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-src
     ${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-build
