Add Ubuntu 24.04 support for feedsim on ARM aarch64 (G5)

packages/feedsim/install_feedsim_aarch64_ubuntu.sh

@@ -34,7 +34,7 @@ apt install -y bc cmake ninja-build flex bison texinfo binutils-dev \
     libunwind-dev bzip2 libbz2-dev libsodium-dev libghc-double-conversion-dev \
     libzstd-dev lz4 liblz4-dev xzip libsnappy-dev libtool libssl-dev \
     zlib1g-dev libdwarf-dev libaio-dev libatomic1 patch perl libiberty-dev \
-    libfmt-dev sysstat jq unzip xxhash libxxhash-dev
+    libfmt-dev sysstat jq unzip xxhash libxxhash-dev libboost-all-dev
 
 # Creates feedsim directory under benchmarks/
 mkdir -p "${BENCHPRESS_ROOT}/benchmarks/feedsim"
@@ -67,9 +67,7 @@ cd ../
 
 # Installing gengetopt
 if ! [ -d "gengetopt-2.23" ]; then
-    # Source the download retry function
-    source "${BENCHPRESS_ROOT}/scripts/download_with_retry.sh"
-    download_with_retry "https://mirrors.ocf.berkeley.edu/gnu/gengetopt/gengetopt-2.23.tar.xz"
+    wget "https://mirrors.ocf.berkeley.edu/gnu/gengetopt/gengetopt-2.23.tar.xz"
     tar -xf "gengetopt-2.23.tar.xz"
     cd "gengetopt-2.23"
     ./configure
@@ -80,19 +78,9 @@ else
     msg "[SKIPPED] gengetopt-2.23"
 fi
 
-# Installing Boost
-if ! [ -d "boost_1_71_0" ]; then
-    wget "https://archives.boost.io/release/1.71.0/source/boost_1_71_0.tar.gz"
-    tar -xzf "boost_1_71_0.tar.gz"
-    cd "boost_1_71_0"
-    ./bootstrap.sh --without-libraries=python
-    sed -i 's/if PTHREAD_STACK_MIN > 0/ifdef PTHREAD_STACK_MIN/g' boost/thread/pthread/thread_data.hpp
-    ./b2
-    ./b2 install
-    cd ../
-else
-    msg "[SKIPPED] boost_1_71_0"
-fi
+# Using system Boost (installed via libboost-all-dev)
+# This avoids ABI mismatch issues that occur when building Boost from source
+msg "[INFO] Using system Boost (libboost-all-dev)"
 
 # Installing gflags
 if ! [ -d "gflags-2.2.2" ]; then
@@ -279,6 +267,11 @@ BP_CXX=g++
 cmake -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH="${FEEDSIM_THIRD_PARTY_SRC}/build-deps" \
+    -DBOOST_ROOT="/usr" \
+    -DBoost_INCLUDE_DIR="/usr/include" \
+    -DBoost_LIBRARY_DIR="/usr/lib/aarch64-linux-gnu" \
+    -DBoost_NO_SYSTEM_PATHS=OFF \
+    -DBoost_NO_BOOST_CMAKE=ON \
     -DCMAKE_C_COMPILER="$BP_CC" \
     -DCMAKE_CXX_COMPILER="$BP_CXX" \
     -DCMAKE_C_FLAGS_RELEASE="$FS_CFLAGS" \

packages/feedsim/third_party/src/CMake/build-fbthrift.cmake

@@ -23,6 +23,9 @@ ExternalProject_Add(fbthrift
         -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=True
         -DCXX_STD:STRING=gnu++17
         -DCMAKE_CXX_STANDARD:STRING=17
+        -DBOOST_ROOT:PATH=${BOOST_ROOT}
+        -DBoost_INCLUDE_DIR:PATH=${Boost_INCLUDE_DIR}
+        -DBoost_NO_BOOST_CMAKE:BOOL=${Boost_NO_BOOST_CMAKE}
     BINARY_DIR ${oldisim_BINARY_DIR}/third_party/fbthrift
     BUILD_BYPRODUCTS
         <INSTALL_DIR>/lib/libthriftcpp2.a
@@ -51,16 +54,16 @@ set(THRIFT1 ${INSTALL_DIR}/bin/thrift1)
 set(THRIFTCPP2 ${INSTALL_DIR}/lib/libthriftcpp2.a)
 
 set(FBTHRIFT_LIBRARIES
-    ${INSTALL_DIR}/lib/libthriftprotocol.a
     ${INSTALL_DIR}/lib/libthriftcpp2.a
-    ${INSTALL_DIR}/lib/libcompiler_ast.a
+    ${INSTALL_DIR}/lib/libthriftprotocol.a
+    ${INSTALL_DIR}/lib/libthrift-core.a
     ${INSTALL_DIR}/lib/libtransport.a
+    ${INSTALL_DIR}/lib/libasync.a
+    ${INSTALL_DIR}/lib/libconcurrency.a
     ${INSTALL_DIR}/lib/libthriftfrozen2.a
+    ${INSTALL_DIR}/lib/libcompiler_ast.a
     ${INSTALL_DIR}/lib/libcompiler_lib.a
-    ${INSTALL_DIR}/lib/libasync.a
-    ${INSTALL_DIR}/lib/libthrift-core.a
     ${INSTALL_DIR}/lib/libcompiler_base.a
-    ${INSTALL_DIR}/lib/libconcurrency.a
 )
 
 set(FBTHRIFT_INCLUDE_DIR

packages/feedsim/third_party/src/CMake/build-fizz.cmake

@@ -23,6 +23,9 @@ ExternalProject_Add(fizz
         -DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR>
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DBUILD_TESTS:BOOL=OFF
+        -DBOOST_ROOT:PATH=${BOOST_ROOT}
+        -DBoost_INCLUDE_DIR:PATH=${Boost_INCLUDE_DIR}
+        -DBoost_NO_BOOST_CMAKE:BOOL=${Boost_NO_BOOST_CMAKE}
     BINARY_DIR ${oldisim_BINARY_DIR}/third_party/fizz
     BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libfizz.a
     BUILD_COMMAND

packages/feedsim/third_party/src/CMake/build-mvfst.cmake

@@ -22,6 +22,9 @@ ExternalProject_Add(mvfst
         -DCXX_STD:STRING=gnu++17
         -DCMAKE_CXX_STANDARD:STRING=17
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DBOOST_ROOT:PATH=${BOOST_ROOT}
+        -DBoost_INCLUDE_DIR:PATH=${Boost_INCLUDE_DIR}
+        -DBoost_NO_BOOST_CMAKE:BOOL=${Boost_NO_BOOST_CMAKE}
     BUILD_COMMAND
         cmake --build .
     )

packages/feedsim/third_party/src/CMake/build-wangle.cmake

@@ -19,6 +19,9 @@ ExternalProject_Add(wangle
         -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=True
         -DCMAKE_INSTALL_PREFIX:PATH=${OLDISIM_STAGING_DIR}
         -DBUILD_TESTS=OFF
+        -DBOOST_ROOT:PATH=${BOOST_ROOT}
+        -DBoost_INCLUDE_DIR:PATH=${Boost_INCLUDE_DIR}
+        -DBoost_NO_BOOST_CMAKE:BOOL=${Boost_NO_BOOST_CMAKE}
     BINARY_DIR ${oldisim_BINARY_DIR}/third_party/wangle
     BUILD_BYPRODUCTS ${OLDISIM_STAGING_DIR}/lib/libwangle.a
     BUILD_COMMAND