Skip to content

Commit 8eed9ad

Browse files
pmienkpmienk
authored
Merge pull request #271 from pmienk/master
Regenerate artifacts.
2 parents 5521aa5 + 57ffd2c commit 8eed9ad

File tree

3 files changed

+51
-18
lines changed

3 files changed

+51
-18
lines changed

‎install-cmake.sh‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -841,13 +841,22 @@ build_from_tarball_boost()
841841
initialize_boost_configuration
842842
initialize_boost_icu_configuration
843843

844+
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
845+
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
846+
cp tools/build/src/engine/b2 .
847+
if [[ (x"$BOOST_CXXFLAGS" == "x") ]]; then
848+
BOOST_CXXFLAGS="cxxflags=${BOOST_FLAGS[@]}"
849+
else
850+
BOOST_CXXFLAGS="$BOOST_CXXFLAGS ${BOOST_FLAGS[@]}"
851+
fi
852+
844853
display_message "Libbitcoin boost configuration."
845854
display_message "--------------------------------------------------------------------"
846855
display_message "variant : release"
847856
display_message "threading : multi"
848857
display_message "toolset : $CC"
849-
display_message "cxxflags : $STDLIB_FLAG"
850-
display_message "linkflags : $STDLIB_FLAG"
858+
display_message "boost cxxflags : $BOOST_CXXFLAGS"
859+
display_message "boost linkflags : $BOOST_LINKFLAGS"
851860
display_message "link : $BOOST_LINK"
852861
display_message "boost.locale.iconv : $BOOST_ICU_ICONV"
853862
display_message "boost.locale.posix : $BOOST_ICU_POSIX"
@@ -861,12 +870,9 @@ build_from_tarball_boost()
861870
display_message "--reconfigure : [ignore cached configuration]"
862871
display_message "--prefix : $PREFIX"
863872
display_message "BOOST_OPTIONS : $*"
873+
display_message "cxxflags (ignored) : $CXXFLAGS"
864874
display_message "--------------------------------------------------------------------"
865875

866-
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
867-
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
868-
cp tools/build/src/engine/b2 .
869-
870876
./bootstrap.sh \
871877
"--with-bjam=./b2" \
872878
"--prefix=$PREFIX" \
@@ -980,6 +986,11 @@ ZMQ_FLAGS=(
980986
ICU_FLAGS=(
981987
"-w")
982988

989+
# Define boost flags.
990+
#------------------------------------------------------------------------------
991+
BOOST_FLAGS=(
992+
"-Wno-enum-constexpr-conversion")
993+
983994
# Define secp256k1 flags.
984995
#------------------------------------------------------------------------------
985996
SECP256K1_FLAGS=(

‎install-cmakepresets.sh‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -890,13 +890,22 @@ build_from_tarball_boost()
890890
initialize_boost_configuration
891891
initialize_boost_icu_configuration
892892

893+
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
894+
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
895+
cp tools/build/src/engine/b2 .
896+
if [[ (x"$BOOST_CXXFLAGS" == "x") ]]; then
897+
BOOST_CXXFLAGS="cxxflags=${BOOST_FLAGS[@]}"
898+
else
899+
BOOST_CXXFLAGS="$BOOST_CXXFLAGS ${BOOST_FLAGS[@]}"
900+
fi
901+
893902
display_message "Libbitcoin boost configuration."
894903
display_message "--------------------------------------------------------------------"
895904
display_message "variant : release"
896905
display_message "threading : multi"
897906
display_message "toolset : $CC"
898-
display_message "cxxflags : $STDLIB_FLAG"
899-
display_message "linkflags : $STDLIB_FLAG"
907+
display_message "boost cxxflags : $BOOST_CXXFLAGS"
908+
display_message "boost linkflags : $BOOST_LINKFLAGS"
900909
display_message "link : $BOOST_LINK"
901910
display_message "boost.locale.iconv : $BOOST_ICU_ICONV"
902911
display_message "boost.locale.posix : $BOOST_ICU_POSIX"
@@ -910,12 +919,9 @@ build_from_tarball_boost()
910919
display_message "--reconfigure : [ignore cached configuration]"
911920
display_message "--prefix : $PREFIX"
912921
display_message "BOOST_OPTIONS : $*"
922+
display_message "cxxflags (ignored) : $CXXFLAGS"
913923
display_message "--------------------------------------------------------------------"
914924

915-
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
916-
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
917-
cp tools/build/src/engine/b2 .
918-
919925
./bootstrap.sh \
920926
"--with-bjam=./b2" \
921927
"--prefix=$PREFIX" \
@@ -1032,6 +1038,11 @@ ZMQ_FLAGS=(
10321038
ICU_FLAGS=(
10331039
"-w")
10341040

1041+
# Define boost flags.
1042+
#------------------------------------------------------------------------------
1043+
BOOST_FLAGS=(
1044+
"-Wno-enum-constexpr-conversion")
1045+
10351046
# Define secp256k1 flags.
10361047
#------------------------------------------------------------------------------
10371048
SECP256K1_FLAGS=(

‎install.sh‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -716,13 +716,22 @@ build_from_tarball_boost()
716716
initialize_boost_configuration
717717
initialize_boost_icu_configuration
718718

719+
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
720+
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
721+
cp tools/build/src/engine/b2 .
722+
if [[ (x"$BOOST_CXXFLAGS" == "x") ]]; then
723+
BOOST_CXXFLAGS="cxxflags=${BOOST_FLAGS[@]}"
724+
else
725+
BOOST_CXXFLAGS="$BOOST_CXXFLAGS ${BOOST_FLAGS[@]}"
726+
fi
727+
719728
display_message "Libbitcoin boost configuration."
720729
display_message "--------------------------------------------------------------------"
721730
display_message "variant : release"
722731
display_message "threading : multi"
723732
display_message "toolset : $CC"
724-
display_message "cxxflags : $STDLIB_FLAG"
725-
display_message "linkflags : $STDLIB_FLAG"
733+
display_message "boost cxxflags : $BOOST_CXXFLAGS"
734+
display_message "boost linkflags : $BOOST_LINKFLAGS"
726735
display_message "link : $BOOST_LINK"
727736
display_message "boost.locale.iconv : $BOOST_ICU_ICONV"
728737
display_message "boost.locale.posix : $BOOST_ICU_POSIX"
@@ -736,12 +745,9 @@ build_from_tarball_boost()
736745
display_message "--reconfigure : [ignore cached configuration]"
737746
display_message "--prefix : $PREFIX"
738747
display_message "BOOST_OPTIONS : $*"
748+
display_message "cxxflags (ignored) : $CXXFLAGS"
739749
display_message "--------------------------------------------------------------------"
740750

741-
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
742-
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
743-
cp tools/build/src/engine/b2 .
744-
745751
./bootstrap.sh \
746752
"--with-bjam=./b2" \
747753
"--prefix=$PREFIX" \
@@ -854,6 +860,11 @@ ZMQ_FLAGS=(
854860
ICU_FLAGS=(
855861
"-w")
856862

863+
# Define boost flags.
864+
#------------------------------------------------------------------------------
865+
BOOST_FLAGS=(
866+
"-Wno-enum-constexpr-conversion")
867+
857868
# Define secp256k1 flags.
858869
#------------------------------------------------------------------------------
859870
SECP256K1_FLAGS=(

0 commit comments

Comments
 (0)