Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerate artifacts. #271

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Regenerate artifacts. #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions install-cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,13 +841,22 @@ build_from_tarball_boost()
initialize_boost_configuration
initialize_boost_icu_configuration

guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
cp tools/build/src/engine/b2 .
if [[ (x"$BOOST_CXXFLAGS" == "x") ]]; then
BOOST_CXXFLAGS="cxxflags=${BOOST_FLAGS[@]}"
else
BOOST_CXXFLAGS="$BOOST_CXXFLAGS ${BOOST_FLAGS[@]}"
fi

display_message "Libbitcoin boost configuration."
display_message "--------------------------------------------------------------------"
display_message "variant : release"
display_message "threading : multi"
display_message "toolset : $CC"
display_message "cxxflags : $STDLIB_FLAG"
display_message "linkflags : $STDLIB_FLAG"
display_message "boost cxxflags : $BOOST_CXXFLAGS"
display_message "boost linkflags : $BOOST_LINKFLAGS"
display_message "link : $BOOST_LINK"
display_message "boost.locale.iconv : $BOOST_ICU_ICONV"
display_message "boost.locale.posix : $BOOST_ICU_POSIX"
Expand All @@ -861,12 +870,9 @@ build_from_tarball_boost()
display_message "--reconfigure : [ignore cached configuration]"
display_message "--prefix : $PREFIX"
display_message "BOOST_OPTIONS : $*"
display_message "cxxflags (ignored) : $CXXFLAGS"
display_message "--------------------------------------------------------------------"

guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
cp tools/build/src/engine/b2 .

./bootstrap.sh \
"--with-bjam=./b2" \
"--prefix=$PREFIX" \
Expand Down Expand Up @@ -980,6 +986,11 @@ ZMQ_FLAGS=(
ICU_FLAGS=(
"-w")

# Define boost flags.
#------------------------------------------------------------------------------
BOOST_FLAGS=(
"-Wno-enum-constexpr-conversion")

# Define secp256k1 flags.
#------------------------------------------------------------------------------
SECP256K1_FLAGS=(
Expand Down
23 changes: 17 additions & 6 deletions install-cmakepresets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,13 +890,22 @@ build_from_tarball_boost()
initialize_boost_configuration
initialize_boost_icu_configuration

guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
cp tools/build/src/engine/b2 .
if [[ (x"$BOOST_CXXFLAGS" == "x") ]]; then
BOOST_CXXFLAGS="cxxflags=${BOOST_FLAGS[@]}"
else
BOOST_CXXFLAGS="$BOOST_CXXFLAGS ${BOOST_FLAGS[@]}"
fi

display_message "Libbitcoin boost configuration."
display_message "--------------------------------------------------------------------"
display_message "variant : release"
display_message "threading : multi"
display_message "toolset : $CC"
display_message "cxxflags : $STDLIB_FLAG"
display_message "linkflags : $STDLIB_FLAG"
display_message "boost cxxflags : $BOOST_CXXFLAGS"
display_message "boost linkflags : $BOOST_LINKFLAGS"
display_message "link : $BOOST_LINK"
display_message "boost.locale.iconv : $BOOST_ICU_ICONV"
display_message "boost.locale.posix : $BOOST_ICU_POSIX"
Expand All @@ -910,12 +919,9 @@ build_from_tarball_boost()
display_message "--reconfigure : [ignore cached configuration]"
display_message "--prefix : $PREFIX"
display_message "BOOST_OPTIONS : $*"
display_message "cxxflags (ignored) : $CXXFLAGS"
display_message "--------------------------------------------------------------------"

guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
cp tools/build/src/engine/b2 .

./bootstrap.sh \
"--with-bjam=./b2" \
"--prefix=$PREFIX" \
Expand Down Expand Up @@ -1032,6 +1038,11 @@ ZMQ_FLAGS=(
ICU_FLAGS=(
"-w")

# Define boost flags.
#------------------------------------------------------------------------------
BOOST_FLAGS=(
"-Wno-enum-constexpr-conversion")

# Define secp256k1 flags.
#------------------------------------------------------------------------------
SECP256K1_FLAGS=(
Expand Down
23 changes: 17 additions & 6 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,13 +716,22 @@ build_from_tarball_boost()
initialize_boost_configuration
initialize_boost_icu_configuration

guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
cp tools/build/src/engine/b2 .
if [[ (x"$BOOST_CXXFLAGS" == "x") ]]; then
BOOST_CXXFLAGS="cxxflags=${BOOST_FLAGS[@]}"
else
BOOST_CXXFLAGS="$BOOST_CXXFLAGS ${BOOST_FLAGS[@]}"
fi

display_message "Libbitcoin boost configuration."
display_message "--------------------------------------------------------------------"
display_message "variant : release"
display_message "threading : multi"
display_message "toolset : $CC"
display_message "cxxflags : $STDLIB_FLAG"
display_message "linkflags : $STDLIB_FLAG"
display_message "boost cxxflags : $BOOST_CXXFLAGS"
display_message "boost linkflags : $BOOST_LINKFLAGS"
display_message "link : $BOOST_LINK"
display_message "boost.locale.iconv : $BOOST_ICU_ICONV"
display_message "boost.locale.posix : $BOOST_ICU_POSIX"
Expand All @@ -736,12 +745,9 @@ build_from_tarball_boost()
display_message "--reconfigure : [ignore cached configuration]"
display_message "--prefix : $PREFIX"
display_message "BOOST_OPTIONS : $*"
display_message "cxxflags (ignored) : $CXXFLAGS"
display_message "--------------------------------------------------------------------"

guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
cp tools/build/src/engine/b2 .

./bootstrap.sh \
"--with-bjam=./b2" \
"--prefix=$PREFIX" \
Expand Down Expand Up @@ -854,6 +860,11 @@ ZMQ_FLAGS=(
ICU_FLAGS=(
"-w")

# Define boost flags.
#------------------------------------------------------------------------------
BOOST_FLAGS=(
"-Wno-enum-constexpr-conversion")

# Define secp256k1 flags.
#------------------------------------------------------------------------------
SECP256K1_FLAGS=(
Expand Down
Loading