diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 97486a6b72749..1683e46d1e3fc 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -179,7 +179,7 @@ jobs: ubuntu-focal-native: - name: 'Ubuntu 20.04, CMake 3.16, Boost from depends' + name: 'Ubuntu 20.04, CMake 3.16, downloaded Boost' runs-on: ubuntu-20.04 steps: @@ -201,10 +201,10 @@ jobs: cmake --version ctest --version - - name: Build Boost in depends - working-directory: depends + - name: Download Boost run: | - make -j $(nproc) NO_LIBEVENT=1 NO_QT=1 NO_WALLET=1 NO_NATPMP=1 NO_UPNP=1 NO_ZMQ=1 NO_USDT=1 ALLOW_HOST_PACKAGES=1 CC=gcc-10 CXX=g++-10 + curl --location --remote-name https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.gz + tar -xf boost_1_84_0.tar.gz - name: Restore Ccache cache uses: actions/cache/restore@v3 @@ -216,7 +216,7 @@ jobs: - name: Generate build system run: | - cmake -B build -DCMAKE_TOOLCHAIN_FILE=depends/x86_64-pc-linux-gnu/share/toolchain.cmake -DENABLE_WALLET=ON -DWITH_NATPMP=ON -DWITH_MINIUPNPC=ON -DWITH_ZMQ=ON -DWITH_USDT=ON -DWERROR=ON + cmake -B build -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DBoost_INCLUDE_DIR="${PWD}/boost_1_84_0" -DENABLE_WALLET=ON -DWITH_MINIUPNPC=ON -DWITH_NATPMP=ON -DWITH_ZMQ=ON -DWITH_USDT=ON -DWERROR=ON - name: Build working-directory: build diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ce1ff726876f..2ba48df5f04ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,9 +183,6 @@ if(CMAKE_CROSSCOMPILING) target_compile_definitions(core_interface INTERFACE ${DEPENDS_COMPILE_DEFINITIONS}) target_compile_options(core_interface INTERFACE "$<$:${DEPENDS_C_COMPILER_FLAGS}>") target_compile_options(core_interface INTERFACE "$<$:${DEPENDS_CXX_COMPILER_FLAGS}>") - if(DEPENDS_ALLOW_HOST_PACKAGES) - list(APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_SYSTEM_PREFIX_PATH}") - endif() endif() include(AddThreadsIfNeeded) diff --git a/depends/Makefile b/depends/Makefile index 68d4214965877..cb84c480c9484 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -276,7 +276,6 @@ $(host_prefix)/share/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_ -e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \ -e 's|@CXXFLAGS@|$(strip $(host_CXXFLAGS) $(host_$(release_type)_CXXFLAGS))|' \ -e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \ - -e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \ -e 's|@no_qt@|$(NO_QT)|' \ -e 's|@no_qr@|$(NO_QR)|' \ -e 's|@no_zmq@|$(NO_ZMQ)|' \ diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in index 35aeef819b760..26a9818b35711 100644 --- a/depends/toolchain.cmake.in +++ b/depends/toolchain.cmake.in @@ -88,12 +88,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) set(PKG_CONFIG_PATH "@depends_prefix@/lib/pkgconfig") -if("@allow_host_packages@" STREQUAL "1") - set(DEPENDS_ALLOW_HOST_PACKAGES TRUE) -else() - set(DEPENDS_ALLOW_HOST_PACKAGES FALSE) - set(PKG_CONFIG_LIBDIR "${PKG_CONFIG_PATH}") -endif() +set(PKG_CONFIG_LIBDIR "${PKG_CONFIG_PATH}") set(QT_TRANSLATIONS_DIR "@depends_prefix@/translations") if(NOT WITH_GUI AND "@no_qt@" STREQUAL "1")