Skip to content

Commit

Permalink
Merge pull request #742 from pmienk/version3
Browse files Browse the repository at this point in the history
Regenerate with BOOST_ROOT assignment via installation scripts.
  • Loading branch information
pmienk authored Oct 5, 2023
2 parents 6c43b1c + 848ed40 commit 8461904
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 26 deletions.
30 changes: 24 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,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
Expand All @@ -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 }}
Expand Down Expand Up @@ -382,6 +388,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
Expand All @@ -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 }}
Expand Down Expand Up @@ -577,6 +589,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
Expand All @@ -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 }}
Expand Down
15 changes: 5 additions & 10 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=<path>, /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
}

Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down
15 changes: 5 additions & 10 deletions install-cmakepresets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -501,15 +501,9 @@ set_pkgconfigdir()
set_with_boost_prefix()
{
if [[ $BUILD_BOOST ]]; then
# Boost has no pkg-config, m4 searches in the following order:
# --with-boost=<path>, /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
}

Expand All @@ -530,6 +524,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"
Expand Down Expand Up @@ -778,7 +773,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"
Expand Down
2 changes: 2 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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"
Expand Down

0 comments on commit 8461904

Please sign in to comment.