Merge pull request #1142 from AntelopeIO/boost_submodule

C++20 support - add boost 1.82 as a submodule
AntelopeIO · Jul 26, 2023 · ee027a7 · ee027a7
2 parents 172eb8d + b9ff799
commit ee027a7
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 76 deletions.
diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
@@ -6,11 +6,12 @@ RUN apt-get update && apt-get upgrade -y && \
                        cmake                \
                        git                  \
                        jq                   \
-                       libboost-all-dev     \
                        libcurl4-openssl-dev \
                        libgmp-dev           \
                        libssl-dev           \
                        llvm-11-dev          \
                        ninja-build          \
                        python3-numpy        \
+                       file                 \
+                       zlib1g-dev           \
                        zstd
diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile
@@ -6,11 +6,12 @@ RUN apt-get update && apt-get upgrade -y && \
                        cmake                \
                        git                  \
                        jq                   \
-                       libboost-all-dev     \
                        libcurl4-openssl-dev \
                        libgmp-dev           \
                        libssl-dev           \
                        llvm-11-dev          \
                        ninja-build          \
                        python3-numpy        \
+                       file                 \
+                       zlib1g-dev           \
                        zstd
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -79,7 +79,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          submodules: true
+          submodules: recursive
       - name: Download builddir
         uses: actions/download-artifact@v3
         with:

diff --git a/.github/workflows/build_base.yaml b/.github/workflows/build_base.yaml
@@ -77,7 +77,7 @@ jobs:
           run: |
             # https://github.com/actions/runner/issues/2033
             chown -R $(id -u):$(id -g) $PWD
-            cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -GNinja
+            cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_LEAP_DEV_DEB=On -GNinja
             cmake --build build
             tar -pc --exclude "*.o" build | zstd --long -T0 -9 > build.tar.zst
         - name: Upload builddir

diff --git a/.gitmodules b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "libraries/cli11/cli11"]
 	path = libraries/cli11/cli11
 	url = https://github.com/AntelopeIO/CLI11.git
+[submodule "libraries/boost"]
+	path = libraries/boost
+	url = https://github.com/boostorg/boost.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -101,12 +101,6 @@ else()
   set(no_whole_archive_flag "--no-whole-archive")
 endif()
 
-set(Boost_USE_MULTITHREADED      ON)
-set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
-# Most boost deps get implictly picked up via fc, as just about everything links to fc. In addition we pick up
-# the pthread dependency through fc.
-find_package(Boost 1.71 REQUIRED COMPONENTS program_options unit_test_framework system)
-
 if( APPLE AND UNIX )
 # Apple Specific Options Here
     message( STATUS "Configuring Leap on macOS" )
@@ -278,6 +272,18 @@ configure_file(${CMAKE_SOURCE_DIR}/libraries/cli11/bash-completion/completions/c
 install(FILES libraries/cli11/bash-completion/completions/leap-util DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/bash-completion/completions COMPONENT base)
 install(FILES libraries/cli11/bash-completion/completions/cleos DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/bash-completion/completions COMPONENT base)
 
+# Add the boost submodule we used to build to our install package, so headers can be found for libtester
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/libraries/boost/"
+        DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/leap_boost
+        COMPONENT dev EXCLUDE_FROM_ALL
+        PATTERN ".git/*" EXCLUDE
+        PATTERN "example/*" EXCLUDE
+        PATTERN "bench/*" EXCLUDE
+        PATTERN "doc/*" EXCLUDE
+        PATTERN "libs/*/test" EXCLUDE
+        PATTERN "tools/*/test" EXCLUDE
+        )
+
 add_custom_target(dev-install
   COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}"
   COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_BINARY_DIR}"
@@ -287,5 +293,7 @@ add_custom_target(dev-install
 
 include(doxygen)
 
+option(ENABLE_LEAP_DEV_DEB "Enable building the leap-dev .deb package" OFF)
+
 include(package.cmake)
 include(CPack)
diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
@@ -35,14 +35,10 @@ else ( APPLE )
    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall")
 endif ( APPLE )
 
+set( Boost_USE_MULTITHREADED      ON )
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
-find_package(Boost @Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@ EXACT REQUIRED COMPONENTS
-   date_time
-   filesystem
-   system
-   chrono
-   iostreams
-   unit_test_framework)
+
+add_subdirectory( @CMAKE_INSTALL_FULL_DATAROOTDIR@/leap_boost ${PROJECT_BINARY_DIR}/libraries/boost EXCLUDE_FROM_ALL)
 
 find_library(libtester eosio_testing @CMAKE_INSTALL_FULL_LIBDIR@ NO_DEFAULT_PATH)
 find_library(libchain eosio_chain @CMAKE_INSTALL_FULL_LIBDIR@ NO_DEFAULT_PATH)
@@ -88,12 +84,18 @@ macro(add_eosio_test_executable test_name)
        ${libbn256}
        @GMP_LIBRARY@
 
-       ${Boost_FILESYSTEM_LIBRARY}
-       ${Boost_SYSTEM_LIBRARY}
-       ${Boost_CHRONO_LIBRARY}
-       ${Boost_IOSTREAMS_LIBRARY}
+       Boost::date_time
+       Boost::filesystem
+       Boost::system
+       Boost::chrono
+       Boost::multi_index
+       Boost::multiprecision
+       Boost::interprocess
+       Boost::asio
+       Boost::signals2
+       Boost::iostreams
        "-lz" # Needed by Boost iostreams
-       ${Boost_DATE_TIME_LIBRARY}
+       Boost::unit_test_framework
 
        ${LLVM_LIBS}
 
@@ -109,7 +111,6 @@ macro(add_eosio_test_executable test_name)
    endif()
 
    target_include_directories( ${test_name} PUBLIC
-                               ${Boost_INCLUDE_DIRS}
                                @OPENSSL_INCLUDE_DIR@
                                @CMAKE_INSTALL_PREFIX@
                                @CMAKE_INSTALL_FULL_INCLUDEDIR@

diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
@@ -32,14 +32,10 @@ else ( APPLE )
    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall")
 endif ( APPLE )
 
+set( Boost_USE_MULTITHREADED      ON )
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
-find_package(Boost @Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@ EXACT REQUIRED COMPONENTS
-   date_time
-   filesystem
-   system
-   chrono
-   iostreams
-   unit_test_framework)
+
+add_subdirectory( @CMAKE_SOURCE_DIR@/libraries/boost ${PROJECT_BINARY_DIR}/libraries/boost EXCLUDE_FROM_ALL)
 
 find_library(libtester eosio_testing @CMAKE_BINARY_DIR@/libraries/testing NO_DEFAULT_PATH)
 find_library(libchain eosio_chain @CMAKE_BINARY_DIR@/libraries/chain NO_DEFAULT_PATH)
@@ -85,12 +81,18 @@ macro(add_eosio_test_executable test_name)
        ${libbn256}
        @GMP_LIBRARY@
 
-       ${Boost_FILESYSTEM_LIBRARY}
-       ${Boost_SYSTEM_LIBRARY}
-       ${Boost_CHRONO_LIBRARY}
-       ${Boost_IOSTREAMS_LIBRARY}
+       Boost::date_time
+       Boost::filesystem
+       Boost::system
+       Boost::chrono
+       Boost::multi_index
+       Boost::multiprecision
+       Boost::interprocess
+       Boost::asio
+       Boost::signals2
+       Boost::iostreams
        "-lz" # Needed by Boost iostreams
-       ${Boost_DATE_TIME_LIBRARY}
+       Boost::unit_test_framework
 
        ${LLVM_LIBS}
 
@@ -106,7 +108,6 @@ macro(add_eosio_test_executable test_name)
    endif()
 
    target_include_directories( ${test_name} PUBLIC
-                               ${Boost_INCLUDE_DIRS}
                                @OPENSSL_INCLUDE_DIR@
                                @CMAKE_SOURCE_DIR@/libraries/chain/include
                                @CMAKE_BINARY_DIR@/libraries/chain/include

diff --git a/README.md b/README.md
@@ -132,12 +132,13 @@ sudo apt-get install -y \
         build-essential \
         cmake \
         git \
-        libboost-all-dev \
         libcurl4-openssl-dev \
         libgmp-dev \
         libssl-dev \
         llvm-11-dev \
-        python3-numpy
+        python3-numpy \
+        file \
+        zlib1g-dev
 ```
 To build, make sure you are in the root of the `leap` repo, then run the following command:
 ```bash

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
@@ -5,6 +5,10 @@ set(SOFTFLOAT_INSTALL_COMPONENT "dev")
 set(EOSVM_INSTALL_COMPONENT "dev")
 set(BN256_INSTALL_COMPONENT "dev")
 
+set( Boost_USE_MULTITHREADED      ON )
+set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
+add_subdirectory( boost EXCLUDE_FROM_ALL )
+
 add_subdirectory( libfc )
 add_subdirectory( builtins )
 add_subdirectory( softfloat )

diff --git a/libraries/appbase b/libraries/appbase
diff --git a/libraries/boost b/libraries/boost
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
@@ -131,8 +131,17 @@ add_library( eosio_chain
              ${HEADERS}
              )
 
+## Boost::accumulators depends on Boost::numeric_ublas, which is still missing cmake support (see
+## https://github.com/boostorg/cmake/issues/39). Until this is fixed, manually add Boost::numeric_ublas
+## as an interface library
+## ----------------------------------------------------------------------------------------------------
+add_library(boost_numeric_ublas INTERFACE)
+add_library(Boost::numeric_ublas ALIAS boost_numeric_ublas)
+
 target_link_libraries( eosio_chain PUBLIC bn256 fc chainbase eosio_rapidjson Logging IR WAST WASM
                        softfloat builtins ${CHAIN_EOSVM_LIBRARIES} ${LLVM_LIBS} ${CHAIN_RT_LINKAGE}
+                       Boost::signals2 Boost::hana Boost::property_tree Boost::multi_index Boost::asio Boost::lockfree
+                       Boost::assign Boost::accumulators
                      )
 target_include_directories( eosio_chain
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"

diff --git a/libraries/chainbase b/libraries/chainbase
diff --git a/libraries/libfc/CMakeLists.txt b/libraries/libfc/CMakeLists.txt
@@ -78,12 +78,6 @@ if(APPLE)
   add_library(zstd INTERFACE)
 endif()
 
-find_package(Boost 1.66 REQUIRED COMPONENTS
-    date_time
-    chrono
-    unit_test_framework
-    iostreams)
-
 find_path(GMP_INCLUDE_DIR NAMES gmp.h)
 find_library(GMP_LIBRARY gmp)
 if(NOT GMP_LIBRARY MATCHES ${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -117,7 +111,8 @@ if(APPLE)
   find_library(security_framework Security)
   find_library(corefoundation_framework CoreFoundation)
 endif()
-target_link_libraries( fc PUBLIC Boost::date_time Boost::chrono Boost::iostreams Threads::Threads
+target_link_libraries( fc PUBLIC Boost::date_time Boost::chrono Boost::iostreams Boost::interprocess Boost::multi_index Boost::dll
+                                 Boost::multiprecision Boost::beast Boost::asio Boost::thread Boost::unit_test_framework Threads::Threads
                                  OpenSSL::Crypto ZLIB::ZLIB ${PLATFORM_SPECIFIC_LIBS} ${CMAKE_DL_LIBS} secp256k1 ${security_framework} ${corefoundation_framework})
 
 # Critically, this ensures that OpenSSL 1.1 & 3.0 both have a variant of BN_zero() with void return value. But it also allows access

diff --git a/package.cmake b/package.cmake
@@ -53,9 +53,10 @@ endif()
 set(CPACK_DEBIAN_PACKAGE_CONFLICTS "eosio, mandel")
 set(CPACK_RPM_PACKAGE_CONFLICTS "eosio, mandel")
 
-#only consider "base" and "dev" components for per-component packages
-get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
-list(REMOVE_ITEM CPACK_COMPONENTS_ALL "Unspecified")
+set(CPACK_COMPONENTS_ALL "base")
+if(ENABLE_LEAP_DEV_DEB)
+   list(APPEND CPACK_COMPONENTS_ALL "dev")
+endif()
 
 #enable per component packages for .deb; ensure main package is just "leap", not "leap-base", and make the dev package have "leap-dev" at the front not the back
 set(CPACK_DEB_COMPONENT_INSTALL ON)
@@ -64,7 +65,7 @@ set(CPACK_DEBIAN_BASE_FILE_NAME "${CPACK_DEBIAN_FILE_NAME}.deb")
 string(REGEX REPLACE "^(${CMAKE_PROJECT_NAME})" "\\1-dev" CPACK_DEBIAN_DEV_FILE_NAME "${CPACK_DEBIAN_BASE_FILE_NAME}")
 
 #deb package tooling will be unable to detect deps for the dev package. llvm is tricky since we don't know what package could have been used; try to figure it out
-set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libboost-all-dev, libssl-dev, libgmp-dev, python3-numpy")
+set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libssl-dev, libgmp-dev, python3-distutils, python3-numpy, zlib1g-dev")
 find_program(DPKG_QUERY "dpkg-query")
 if(DPKG_QUERY AND OS_RELEASE MATCHES "\n?ID=\"?ubuntu" AND LLVM_CMAKE_DIR)
    execute_process(COMMAND "${DPKG_QUERY}" -S "${LLVM_CMAKE_DIR}" COMMAND cut -d: -f1 RESULT_VARIABLE LLVM_PKG_FIND_RESULT OUTPUT_VARIABLE LLVM_PKG_FIND_OUTPUT)

diff --git a/plugins/chain_plugin/CMakeLists.txt b/plugins/chain_plugin/CMakeLists.txt
@@ -11,7 +11,7 @@ if(EOSIO_ENABLE_DEVELOPER_OPTIONS)
     target_compile_definitions(chain_plugin PUBLIC EOSIO_DEVELOPER)
 endif()
 
-target_link_libraries( chain_plugin eosio_chain custom_appbase appbase resource_monitor_plugin )
+target_link_libraries( chain_plugin eosio_chain custom_appbase appbase resource_monitor_plugin Boost::bimap )
 target_include_directories( chain_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../chain_interface/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/appbase/include" "${CMAKE_CURRENT_SOURCE_DIR}/../resource_monitor_plugin/include")
 
-add_subdirectory( test )
+add_subdirectory( test )
diff --git a/programs/cleos/CMakeLists.txt b/programs/cleos/CMakeLists.txt
@@ -13,7 +13,7 @@ set(LOCALEDOMAIN ${CLI_CLIENT_EXECUTABLE_NAME})
 target_include_directories(${CLI_CLIENT_EXECUTABLE_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries( ${CLI_CLIENT_EXECUTABLE_NAME}
-                       PRIVATE appbase version leap-cli11 chain_api_plugin producer_plugin chain_plugin http_plugin eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                       PRIVATE appbase version leap-cli11 chain_api_plugin producer_plugin chain_plugin http_plugin eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} Boost::process Boost::dll )
 
 if (CURL_FOUND)
   target_sources(${CLI_CLIENT_EXECUTABLE_NAME} PRIVATE do_http_post_libcurl.cpp)

diff --git a/programs/nodeos/CMakeLists.txt b/programs/nodeos/CMakeLists.txt
@@ -40,7 +40,8 @@ target_link_libraries( ${NODE_EXECUTABLE_NAME}
         PRIVATE -Wl,${whole_archive_flag} prometheus_plugin          -Wl,${no_whole_archive_flag}
         PRIVATE -Wl,${build_id_flag}
         PRIVATE chain_plugin http_plugin producer_plugin http_client_plugin
-        PRIVATE eosio_chain_wrap fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+        PRIVATE eosio_chain_wrap fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS}
+        Boost::dll )
 
 
 include(additionalPlugins)

diff --git a/scripts/pinned_build.sh b/scripts/pinned_build.sh
@@ -30,7 +30,6 @@ DEP_DIR="$(realpath "$1")"
 LEAP_DIR="$2"
 JOBS="$3"
 CLANG_VER=11.0.1
-BOOST_VER=1.82.0
 LLVM_VER=11.0.1
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )";
 START_DIR="$(pwd)"
@@ -101,27 +100,10 @@ install_llvm() {
     export LLVM_DIR="${LLVM_DIR}"
 }
 
-install_boost() {
-    BOOST_DIR="$1"
-
-    if [ ! -d "${BOOST_DIR}" ]; then
-        echo "Installing Boost ${BOOST_VER} @ ${BOOST_DIR}"
-        try wget -O "boost_${BOOST_VER//\./_}.tar.gz" "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VER}/source/boost_${BOOST_VER//\./_}.tar.gz"
-        try tar -xvzf "boost_${BOOST_VER//\./_}.tar.gz" -C "${DEP_DIR}"
-        pushdir "${BOOST_DIR}"
-        try ./bootstrap.sh -with-toolset=clang --prefix="${BOOST_DIR}/bin"
-        ./b2 toolset=clang cxxflags="-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I\${CLANG_DIR}/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE" linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-system --with-program_options --with-chrono --with-test -q -j "${JOBS}" install
-        popdir "${DEP_DIR}"
-        rm "boost_${BOOST_VER//\./_}.tar.gz"
-    fi
-    export BOOST_DIR="${BOOST_DIR}"
-}
-
 pushdir "${DEP_DIR}"
 
 install_clang "${DEP_DIR}/clang-${CLANG_VER}"
 install_llvm "${DEP_DIR}/llvm-${LLVM_VER}"
-install_boost "${DEP_DIR}/boost_${BOOST_VER//\./_}"
 
 # go back to the directory where the script starts
 popdir "${START_DIR}"
@@ -130,7 +112,7 @@ pushdir "${LEAP_DIR}"
 
 # build Leap
 echo "Building Leap ${SCRIPT_DIR}"
-try cmake -DCMAKE_TOOLCHAIN_FILE="${SCRIPT_DIR}/pinned_toolchain.cmake" -DCMAKE_INSTALL_PREFIX=${LEAP_PINNED_INSTALL_PREFIX:-/usr/local} -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${LLVM_DIR}/lib/cmake" -DCMAKE_PREFIX_PATH="${BOOST_DIR}/bin" "${SCRIPT_DIR}/.."
+try cmake -DCMAKE_TOOLCHAIN_FILE="${SCRIPT_DIR}/pinned_toolchain.cmake" -DCMAKE_INSTALL_PREFIX=${LEAP_PINNED_INSTALL_PREFIX:-/usr/local} -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${LLVM_DIR}/lib/cmake" "${SCRIPT_DIR}/.."
 
 try make -j "${JOBS}"
 try cpack

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -106,9 +106,9 @@ add_subdirectory( performance_tests )
 
 find_package(Threads)
 add_executable(ship_client ship_client.cpp)
-target_link_libraries(ship_client abieos Boost::program_options Boost::system Threads::Threads)
+target_link_libraries(ship_client abieos Boost::program_options Boost::system Boost::algorithm Boost::asio Boost::beast Threads::Threads)
 add_executable(ship_streamer ship_streamer.cpp)
-target_link_libraries(ship_streamer abieos Boost::program_options Boost::system Threads::Threads)
+target_link_libraries(ship_streamer abieos Boost::program_options Boost::system Boost::asio Boost::beast Threads::Threads)
 
 add_test(NAME cluster_launcher COMMAND tests/cluster_launcher.py -v ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST cluster_launcher PROPERTY LABELS nonparallelizable_tests)