From d1ee8375ae7b256c09ae26f813f54d5ccf8c5e05 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Wed, 4 Oct 2023 14:21:59 -0700 Subject: [PATCH] Regenerate with BOOST_ROOT assignemnt via installation scripts. --- .github/workflows/ci.yml | 30 ++++++++++++++++++++++++------ install-cmake.sh | 15 +++++---------- install-cmakepresets.sh | 15 +++++---------- install.sh | 2 ++ 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1eeda93..40d916b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -161,6 +161,12 @@ jobs: 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 @@ -170,8 +176,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 }} @@ -395,6 +401,12 @@ jobs: 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 @@ -404,8 +416,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 }} @@ -594,6 +606,12 @@ jobs: 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 @@ -603,8 +621,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 }} diff --git a/install-cmake.sh b/install-cmake.sh index af71270..879eb74 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -450,15 +450,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 } @@ -479,6 +473,7 @@ display_configuration() display_message "BUILD_ICU : $BUILD_ICU" display_message "BUILD_ZMQ : $BUILD_ZMQ" 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" @@ -723,7 +718,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 7a2ec23..eb5f5bf 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -495,15 +495,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 } @@ -524,6 +518,7 @@ display_configuration() display_message "BUILD_ICU : $BUILD_ICU" display_message "BUILD_ZMQ : $BUILD_ZMQ" 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" @@ -772,7 +767,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 f713bb1..376dce6 100755 --- a/install.sh +++ b/install.sh @@ -397,6 +397,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 } @@ -417,6 +418,7 @@ display_configuration() display_message "BUILD_ICU : $BUILD_ICU" display_message "BUILD_ZMQ : $BUILD_ZMQ" 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"