From f890be3e378544cda5cad38f5799943adc84d05b Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Tue, 6 Feb 2024 15:41:25 -0800 Subject: [PATCH] Regenerate artifacts. --- .github/workflows/ci.yml | 110 ++++++++++++++++++------------- builds/cmake/CMakeLists.txt | 127 +++++++++++++++++++++++------------- configure.ac | 6 ++ install-cmake.sh | 15 ++--- install-cmakepresets.sh | 15 ++--- install.sh | 2 + 6 files changed, 162 insertions(+), 113 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26e6892f..c9123e9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,22 +18,22 @@ jobs: matrix: include: - os: ubuntu-22.04 - cxx: "clang++-14" + cxx: "clang++-15" link: "dynamic" - optimization: "size" + optimization: "debug" assert: "debug" coverage: "nocov" boost: "--build-boost" consensus: "--with-consensus" icu: "" - cc: "clang-14" - flags: "-Os -fPIE" + cc: "clang-15" + flags: "-Og -fPIE" options: "--enable-isystem" packager: "apt" packages: "" - os: ubuntu-22.04 - cxx: "clang++-14" + cxx: "clang++-15" link: "static" optimization: "size" assert: "ndebug" @@ -41,7 +41,7 @@ jobs: boost: "--build-boost" consensus: "--with-consensus" icu: "--build-icu --with-icu" - cc: "clang-14" + cc: "clang-15" flags: "-Os -fPIE" options: "--enable-isystem" packager: "apt" @@ -65,20 +65,20 @@ jobs: - os: ubuntu-22.04 cxx: "g++-11" link: "static" - optimization: "debug" + optimization: "size" assert: "ndebug" coverage: "cov" boost: "--build-boost" consensus: "--with-consensus" icu: "--build-icu --with-icu" cc: "gcc-11" - flags: "-Og -g --coverage -fPIE" + flags: "-Os -g --coverage -fPIE" options: "--enable-isystem" packager: "apt" packages: "lcov" - os: macos-latest - cxx: "clang++-14" + cxx: "clang++" link: "dynamic" optimization: "size" assert: "ndebug" @@ -86,14 +86,14 @@ jobs: boost: "--build-boost" consensus: "--with-consensus" icu: "--build-icu --with-icu" - cc: "clang-14" + cc: "clang" flags: "-Os -fPIE" options: "--enable-isystem" packager: "brew" packages: "" - os: macos-latest - cxx: "clang++-14" + cxx: "clang++" link: "static" optimization: "size" assert: "ndebug" @@ -101,7 +101,7 @@ jobs: boost: "--build-boost" consensus: "--without-consensus" icu: "--build-icu --with-icu" - cc: "clang-14" + cc: "clang" flags: "-Os -fvisibility=hidden -fPIE" options: "--enable-isystem" packager: "brew" @@ -119,7 +119,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Prepare toolchain [generic] run: | @@ -140,7 +140,7 @@ jobs: shell: bash run: | WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-node}" - echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV + echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV if [[ ${{ matrix.assert }} == 'ndebug' ]]; then echo "ASSERT_NDEBUG=--enable-ndebug" >> $GITHUB_ENV else @@ -152,9 +152,15 @@ jobs: echo "LINKAGE=--disable-shared" >> $GITHUB_ENV fi if [[ ${{ matrix.link }} == 'dynamic' ]]; then - echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV + echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/lib" >> $GITHUB_ENV fi + - name: Display Compiler details + shell: bash + run: | + ${CC} -v + ${CXX} -v + - name: Display CPU details if: ${{ (runner.os == 'Linux') }} shell: bash @@ -164,8 +170,8 @@ jobs: - name: Execute install.sh run: > ./install.sh - --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} - --prefix=$LIBBITCOIN_SRC_PATH/prefix + --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }} + --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} ${{ matrix.boost }} @@ -242,22 +248,22 @@ jobs: matrix: include: - os: ubuntu-22.04 - cxx: "clang++-14" + cxx: "clang++-15" link: "dynamic" - optimization: "size" + optimization: "debug" assert: "debug" coverage: "nocov" boost: "--build-boost" consensus: "--with-consensus" icu: "" - cc: "clang-14" - flags: "-Os -fPIE" + cc: "clang-15" + flags: "-Og -fPIE" options: "" packager: "apt" packages: "" - os: ubuntu-22.04 - cxx: "clang++-14" + cxx: "clang++-15" link: "static" optimization: "size" assert: "ndebug" @@ -265,7 +271,7 @@ jobs: boost: "--build-boost" consensus: "--with-consensus" icu: "--build-icu --with-icu" - cc: "clang-14" + cc: "clang-15" flags: "-Os -fPIE" options: "" packager: "apt" @@ -289,20 +295,20 @@ jobs: - os: ubuntu-22.04 cxx: "g++-11" link: "static" - optimization: "debug" + optimization: "size" assert: "ndebug" coverage: "nocov" boost: "--build-boost" consensus: "--with-consensus" icu: "--build-icu --with-icu" cc: "gcc-11" - flags: "-Og -fPIE" + flags: "-Os -fPIE" options: "" packager: "apt" packages: "" - os: macos-latest - cxx: "clang++-14" + cxx: "clang++" link: "dynamic" optimization: "size" assert: "ndebug" @@ -310,14 +316,14 @@ jobs: boost: "--build-boost" consensus: "--with-consensus" icu: "--build-icu --with-icu" - cc: "clang-14" + cc: "clang" flags: "-Os -fPIE" options: "" packager: "brew" packages: "" - os: macos-latest - cxx: "clang++-14" + cxx: "clang++" link: "static" optimization: "size" assert: "ndebug" @@ -325,7 +331,7 @@ jobs: boost: "--build-boost" consensus: "--without-consensus" icu: "--build-icu --with-icu" - cc: "clang-14" + cc: "clang" flags: "-Os -fvisibility=hidden -fPIE" options: "" packager: "brew" @@ -343,7 +349,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Prepare toolchain [generic] run: | @@ -364,7 +370,7 @@ jobs: shell: bash run: | WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-node}" - echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV + echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV if [[ ${{ matrix.packager }} == 'brew' ]]; then echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV fi @@ -379,9 +385,15 @@ jobs: echo "LINKAGE=--disable-shared" >> $GITHUB_ENV fi if [[ ${{ matrix.link }} == 'dynamic' ]]; then - echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV + echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/lib" >> $GITHUB_ENV fi + - name: Display Compiler details + shell: bash + run: | + ${CC} -v + ${CXX} -v + - name: Display CPU details if: ${{ (runner.os == 'Linux') }} shell: bash @@ -391,8 +403,8 @@ jobs: - name: Execute install-cmake.sh run: > ./install-cmake.sh - --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} - --prefix=$LIBBITCOIN_SRC_PATH/prefix + --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }} + --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} ${{ matrix.boost }} @@ -480,23 +492,23 @@ jobs: include: - os: ubuntu-22.04 preset: "nix-gnu-debug-shared" - cxx: "clang++-14" + cxx: "clang++-15" link: "dynamic" - optimization: "size" + optimization: "debug" assert: "debug" coverage: "nocov" boost: "--build-boost" consensus: "--with-consensus" icu: "" - cc: "clang-14" - flags: "-Os -fPIE" + cc: "clang-15" + flags: "-Og -fPIE" options: "" packager: "apt" packages: "" - os: ubuntu-22.04 preset: "nix-gnu-release-static-size" - cxx: "clang++-14" + cxx: "clang++-15" link: "static" optimization: "size" assert: "ndebug" @@ -504,7 +516,7 @@ jobs: boost: "--build-boost" consensus: "--with-consensus" icu: "--build-icu --with-icu" - cc: "clang-14" + cc: "clang-15" flags: "-Os -fPIE" options: "" packager: "apt" @@ -538,7 +550,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Prepare toolchain [generic] run: | @@ -559,7 +571,7 @@ jobs: shell: bash run: | WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-node}" - echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV + echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV if [[ ${{ matrix.packager }} == 'brew' ]]; then echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV fi @@ -574,9 +586,15 @@ jobs: echo "LINKAGE=--disable-shared" >> $GITHUB_ENV fi if [[ ${{ matrix.link }} == 'dynamic' ]]; then - echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV + echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV fi + - name: Display Compiler details + shell: bash + run: | + ${CC} -v + ${CXX} -v + - name: Display CPU details if: ${{ (runner.os == 'Linux') }} shell: bash @@ -586,8 +604,8 @@ jobs: - name: Execute install-cmakepresets.sh run: > ./install-cmakepresets.sh - --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} - --prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }} + --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }} + --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix/${{ matrix.preset }} --preset=${{ matrix.preset }} ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} @@ -694,7 +712,7 @@ jobs: msbuild-architecture: x64 - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize SDK shell: powershell diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index abb9453c..3db37f93 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -7,7 +7,7 @@ # libbitcoin-node project configuration. #------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18 FATAL_ERROR) project(libbitcoin-node LANGUAGES C CXX) @@ -18,6 +18,7 @@ include(CheckIncludeFiles) include(CheckSymbolExists) include(CheckCXXCompilerFlag) include(CheckCXXSourceCompiles) +include(CheckLinkerFlag) set_property(GLOBAL PROPERTY USE_FOLDERS ON) @@ -150,11 +151,7 @@ find_package( Boost 1.76.0 REQUIRED COMPONENTS set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" ) -if (enable-ndebug) - set( Boost_LIBRARY_DIR "${Boost_LIBRARY_DIR_DEBUG}" ) -else () - set( Boost_LIBRARY_DIR "${Boost_LIBRARY_DIR_RELEASE}" ) -endif() +set( Boost_LIBRARY_DIR $,"${Boost_LIBRARY_DIR_RELEASE}","${Boost_LIBRARY_DIR_DEBUG}">) set( boost_CPPFLAGS "-I${Boost_INCLUDE_DIR}" ) set( boost_LDFLAGS "-L${Boost_LIBRARY_DIR}" ) @@ -173,46 +170,75 @@ find_package( Bitcoin-Blockchain 4.0.0 REQUIRED ) #------------------------------------------------------------------------------ find_package( Bitcoin-Network 4.0.0 REQUIRED ) -# Define project common includes directories +# Define project common includes for build. #------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - include_directories( SYSTEM - ${bitcoin_blockchain_INCLUDE_DIRS} - ${bitcoin_network_INCLUDE_DIRS} ) + set( bitcoin_blockchain_FOR_BUILD_INCLUDE_DIRS ${bitcoin_blockchain_INCLUDE_DIRS} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_INCLUDE_DIRS ${bitcoin_network_INCLUDE_DIRS} CACHE STRING "Placeholder" ) else() - include_directories( SYSTEM - ${bitcoin_blockchain_STATIC_INCLUDE_DIRS} - ${bitcoin_network_STATIC_INCLUDE_DIRS} ) + set( bitcoin_blockchain_FOR_BUILD_INCLUDE_DIRS ${bitcoin_blockchain_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_INCLUDE_DIRS ${bitcoin_network_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" ) endif() -# Define project common library directories +# Define project common includes directories +#------------------------------------------------------------------------------ +include_directories( SYSTEM + ${bitcoin_blockchain_FOR_BUILD_INCLUDE_DIRS} + ${bitcoin_network_FOR_BUILD_INCLUDE_DIRS} ) + +# Define project common library directories for build. #------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - link_directories( - ${bitcoin_blockchain_LIBRARY_DIRS} - ${bitcoin_network_LIBRARY_DIRS} ) + set( bitcoin_blockchain_FOR_BUILD_LIBRARY_DIRS ${bitcoin_blockchain_LIBRARY_DIRS} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_LIBRARY_DIRS ${bitcoin_network_LIBRARY_DIRS} CACHE STRING "Placeholder" ) else() - link_directories( - ${bitcoin_blockchain_STATIC_LIBRARY_DIRS} - ${bitcoin_network_STATIC_LIBRARY_DIRS} ) + set( bitcoin_blockchain_FOR_BUILD_LIBRARY_DIRS ${bitcoin_blockchain_STATIC_LIBRARY_DIRS} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_LIBRARY_DIRS ${bitcoin_network_STATIC_LIBRARY_DIRS} CACHE STRING "Placeholder" ) +endif() + +# Define project common library directories +#------------------------------------------------------------------------------ +link_directories( + ${bitcoin_blockchain_FOR_BUILD_LIBRARY_DIRS} + ${bitcoin_network_FOR_BUILD_LIBRARY_DIRS} ) + +# Define project common linker flags. +#------------------------------------------------------------------------------ +check_linker_flag(CXX "-no_fixup_chains" "no_fixup_chains_FOUND") + +if (no_fixup_chains_FOUND) + add_link_options("-no_fixup_chains") +endif() + +check_linker_flag(CXX "-fstack-protector" "fstack_protector_FOUND") + +if (fstack_protector_FOUND) + add_link_options("-fstack-protector") +endif() + +check_linker_flag(CXX "-fstack-protector-all" "fstack_protector_all_FOUND") + +if (fstack_protector_all_FOUND) + add_link_options("-fstack-protector-all") endif() -# Define project common libraries/linker flags. + +# Define common library usage for build. #------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - link_libraries( - "-fstack-protector" - "-fstack-protector-all" - ${bitcoin_blockchain_LIBRARIES} - ${bitcoin_network_LIBRARIES} ) + set( bitcoin_blockchain_FOR_BUILD_LIBRARIES ${bitcoin_blockchain_LIBRARIES} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_LIBRARIES ${bitcoin_network_LIBRARIES} CACHE STRING "Placeholder" ) else() - link_libraries( - "-fstack-protector" - "-fstack-protector-all" - ${bitcoin_blockchain_STATIC_LIBRARIES} - ${bitcoin_network_STATIC_LIBRARIES} ) + set( bitcoin_blockchain_FOR_BUILD_LIBRARIES ${bitcoin_blockchain_STATIC_LIBRARIES} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_LIBRARIES ${bitcoin_network_STATIC_LIBRARIES} CACHE STRING "Placeholder" ) endif() +# Define project common libraries. +#------------------------------------------------------------------------------ +link_libraries( + ${bitcoin_blockchain_FOR_BUILD_LIBRARIES} + ${bitcoin_network_FOR_BUILD_LIBRARIES} ) + add_definitions( -DSYSCONFDIR=\"${sysconfdir}\" ) @@ -235,35 +261,42 @@ add_library( ${CANONICAL_LIB_NAME} "../../src/protocols/protocol_transaction_out.cpp" "../../src/sessions/session.cpp" ) -# ${CANONICAL_LIB_NAME} project specific include directories. +# ${CANONICAL_LIB_NAME} project specific include directory normalization for build. #------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE - "../../include" - ${bitcoin_blockchain_INCLUDE_DIRS} - ${bitcoin_network_INCLUDE_DIRS} ) + set( bitcoin_blockchain_FOR_BUILD_INCLUDE_DIRS ${bitcoin_blockchain_INCLUDE_DIRS} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_INCLUDE_DIRS ${bitcoin_network_INCLUDE_DIRS} CACHE STRING "Placeholder" ) else() - target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE - "../../include" - ${bitcoin_blockchain_STATIC_INCLUDE_DIRS} - ${bitcoin_network_STATIC_INCLUDE_DIRS} ) + set( bitcoin_blockchain_FOR_BUILD_INCLUDE_DIRS ${bitcoin_blockchain_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_INCLUDE_DIRS ${bitcoin_network_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" ) endif() +# ${CANONICAL_LIB_NAME} project specific include directories. +#------------------------------------------------------------------------------ +target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE + "../../include" + ${bitcoin_blockchain_FOR_BUILD_INCLUDE_DIRS} + ${bitcoin_network_FOR_BUILD_INCLUDE_DIRS} ) + target_include_directories( ${CANONICAL_LIB_NAME} PUBLIC "../../include" ) -# ${CANONICAL_LIB_NAME} project specific libraries/linker flags. +# ${CANONICAL_LIB_NAME} project specific libraries noramalization for build. #------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - target_link_libraries( ${CANONICAL_LIB_NAME} - ${bitcoin_blockchain_LIBRARIES} - ${bitcoin_network_LIBRARIES} ) + set( bitcoin_blockchain_FOR_BUILD_LIBRARIES ${bitcoin_blockchain_LIBRARIES} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_LIBRARIES ${bitcoin_network_LIBRARIES} CACHE STRING "Placeholder" ) else() - target_link_libraries( ${CANONICAL_LIB_NAME} - ${bitcoin_blockchain_STATIC_LIBRARIES} - ${bitcoin_network_STATIC_LIBRARIES} ) + set( bitcoin_blockchain_FOR_BUILD_LIBRARIES ${bitcoin_blockchain_STATIC_LIBRARIES} CACHE STRING "Placeholder" ) + set( bitcoin_network_FOR_BUILD_LIBRARIES ${bitcoin_network_STATIC_LIBRARIES} CACHE STRING "Placeholder" ) endif() +# ${CANONICAL_LIB_NAME} project specific libraries/linker flags. +#------------------------------------------------------------------------------ +target_link_libraries( ${CANONICAL_LIB_NAME} + ${bitcoin_blockchain_FOR_BUILD_LIBRARIES} + ${bitcoin_network_FOR_BUILD_LIBRARIES} ) + # Define libbitcoin-node-test project. #------------------------------------------------------------------------------ if (with-tests) diff --git a/configure.ac b/configure.ac index 43d69b54..461478e4 100644 --- a/configure.ac +++ b/configure.ac @@ -215,6 +215,12 @@ AS_CASE([${CC}], [*clang*], [AX_CHECK_COMPILE_FLAG([-Wno-mismatched-tags], [CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"])]) +# Address -undefined dynamic_lookup MacOS error. +#------------------------------------------------------------------------------ +AS_CASE([${CC}], [*], + [AX_CHECK_LINK_FLAG([-no_fixup_chains], + [LDFLAGS="$LDFLAGS -no_fixup_chains"])]) + # Protect stack. #------------------------------------------------------------------------------ AS_CASE([${CC}], [*], diff --git a/install-cmake.sh b/install-cmake.sh index 74c1d5f4..19aab22e 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -461,15 +461,9 @@ set_pkgconfigdir() set_with_boost_prefix() { if [[ $BUILD_BOOST ]]; then - # Boost has no pkg-config, m4 searches in the following order: - # --with-boost=, /usr, /usr/local, /opt, /opt/local, $BOOST_ROOT. - # We use --with-boost to prioritize the --prefix path when we build it. - # Otherwise standard paths suffice for Linux, Homebrew and MacPorts. - # ax_boost_base.m4 appends /include and adds to BOOST_CPPFLAGS - # ax_boost_base.m4 searches for /lib /lib64 and adds to BOOST_LDFLAGS - # - # cmake does not process this argument, so it has been zeroed out. - with_boost="" + # Boost detection via FindBoost.cmake provides for path hint via + # $BOOT_ROOT environment variable only. + export BOOST_ROOT="$PREFIX" fi } @@ -489,6 +483,7 @@ display_configuration() display_message "WITH_ICU : $WITH_ICU" display_message "BUILD_ICU : $BUILD_ICU" display_message "BUILD_BOOST : $BUILD_BOOST" + display_message "BOOST_ROOT : $BOOST_ROOT" display_message "BUILD_DIR : $BUILD_DIR" display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS" display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE" @@ -733,7 +728,7 @@ cmake_project_directory() local PROJ_CONFIG_DIR PROJ_CONFIG_DIR=$(pwd) - cmake $@ builds/cmake + cmake -LA $@ builds/cmake make_jobs "$JOBS" if [[ $TEST == true ]]; then diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 8eb49fde..dbf7e34a 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -509,15 +509,9 @@ set_pkgconfigdir() set_with_boost_prefix() { if [[ $BUILD_BOOST ]]; then - # Boost has no pkg-config, m4 searches in the following order: - # --with-boost=, /usr, /usr/local, /opt, /opt/local, $BOOST_ROOT. - # We use --with-boost to prioritize the --prefix path when we build it. - # Otherwise standard paths suffice for Linux, Homebrew and MacPorts. - # ax_boost_base.m4 appends /include and adds to BOOST_CPPFLAGS - # ax_boost_base.m4 searches for /lib /lib64 and adds to BOOST_LDFLAGS - # - # cmake does not process this argument, so it has been zeroed out. - with_boost="" + # Boost detection via FindBoost.cmake provides for path hint via + # $BOOT_ROOT environment variable only. + export BOOST_ROOT="$PREFIX" fi } @@ -537,6 +531,7 @@ display_configuration() display_message "WITH_ICU : $WITH_ICU" display_message "BUILD_ICU : $BUILD_ICU" display_message "BUILD_BOOST : $BUILD_BOOST" + display_message "BOOST_ROOT : $BOOST_ROOT" display_message "BUILD_DIR : $BUILD_DIR" display_message "PRESET_ID : $PRESET_ID" display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS" @@ -785,7 +780,7 @@ cmake_project_directory() push_directory "builds/cmake" display_message "Preparing cmake --preset=$PRESET $@" - cmake --preset=$PRESET $@ + cmake -LA --preset=$PRESET $@ popd push_directory "obj/$PRESET" diff --git a/install.sh b/install.sh index 338658e8..98842a52 100755 --- a/install.sh +++ b/install.sh @@ -399,6 +399,7 @@ set_with_boost_prefix() # ax_boost_base.m4 appends /include and adds to BOOST_CPPFLAGS # ax_boost_base.m4 searches for /lib /lib64 and adds to BOOST_LDFLAGS with_boost="--with-boost=$PREFIX" + export BOOST_ROOT="$PREFIX" fi } @@ -418,6 +419,7 @@ display_configuration() display_message "WITH_ICU : $WITH_ICU" display_message "BUILD_ICU : $BUILD_ICU" display_message "BUILD_BOOST : $BUILD_BOOST" + display_message "BOOST_ROOT : $BOOST_ROOT" display_message "BUILD_DIR : $BUILD_DIR" display_message "PREFIX : $PREFIX" display_message "DISABLE_SHARED : $DISABLE_SHARED"