From 84e0385aefd63afacb7cbae7cf76c3c3a1303b41 Mon Sep 17 00:00:00 2001
From: Phillip Mienk <mienkphi@gmail.com>
Date: Sun, 18 Feb 2024 21:39:19 -0800
Subject: [PATCH 1/5] Add installation embedded CPPFLAGS support (for warning
 suppression).

---
 generate3.xml                                 |  6 ++++
 generate4.xml                                 | 10 ++++++
 templates/gsl.developer_setup.sh              | 34 +++++++++++++++++++
 templates/gsl.install-cmake.sh                | 29 ++++++++++++++++
 templates/gsl.install-cmakepresets.sh         | 29 ++++++++++++++++
 templates/gsl.install.sh                      | 25 ++++++++++++++
 .../shared/common_install_shell_artifacts.gsl | 15 ++++++++
 7 files changed, 148 insertions(+)

diff --git a/generate3.xml b/generate3.xml
index 14c84d9..8946299 100644
--- a/generate3.xml
+++ b/generate3.xml
@@ -137,10 +137,12 @@
     <install>
       <!-- Boost.system is necessary for detection, which is only required for test. -->
       <build name="boost" version="1.73.0" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--with-system" />
         <option value="--with-test" />
       </build>
       <build name="secp256k1" github="libbitcoin" repository="secp256k1" branch="version7" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--disable-tests" />
         <option value="--enable-module-recovery" />
       </build>
@@ -375,6 +377,7 @@
     <install>
       <!-- Building with our minimum (c++11 only) version of ICU. -->
       <build name="icu" version="55.2" parallel="true" >
+        <flag value="-w" />
         <!-- TODO: verify this with more recent ICU. -->
         <!-- Bug in ICU 55.2 build requires enable-draft. -->
         <option value="--enable-draft" />
@@ -388,6 +391,7 @@
         <option value="--disable-samples" />
       </build>
       <build name="boost" version="1.73.0" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--with-atomic" />
         <option value="--with-chrono" />
         <option value="--with-date_time" />
@@ -402,6 +406,7 @@
         <option value="--with-test" />
       </build>
       <build name="secp256k1" github="libbitcoin" repository="secp256k1" branch="version7" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--disable-tests" />
         <option value="--enable-module-recovery" />
       </build>
@@ -785,6 +790,7 @@
         <option value="${with_pkgconfigdir}" />
       </build>
       <build name="zmq" version="4.3.4" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--disable-Werror" />
       </build>
       <build name="bitcoin-protocol" github="libbitcoin" repository="libbitcoin-protocol" branch="version3" parallel="true" >
diff --git a/generate4.xml b/generate4.xml
index 35cf2db..b5a7518 100644
--- a/generate4.xml
+++ b/generate4.xml
@@ -140,10 +140,12 @@
     <install>
       <!-- Boost.system is necessary for detection, which is only required for test. -->
       <build name="boost" version="1.78.0" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--with-system" />
         <option value="--with-test" />
       </build>
       <build name="secp256k1" github="libbitcoin" repository="secp256k1" branch="version8" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--disable-tests" />
         <option value="--enable-experimental" />
         <option value="--enable-module-recovery" />
@@ -463,6 +465,7 @@
     <install>
       <!-- Building with our minimum (c++11 only) version of ICU. -->
       <build name="icu" version="55.2" parallel="true" >
+        <flag value="-w" />
         <!-- TODO: verify this with more recent ICU. -->
         <!-- Bug in ICU 55.2 build requires -enable-draft. -->
         <option value="--enable-draft" />
@@ -476,6 +479,7 @@
         <option value="--disable-samples" />
       </build>
       <build name="boost" version="1.78.0" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--with-chrono" />
         <option value="--with-iostreams" />
         <option value="--with-json" />
@@ -486,6 +490,7 @@
         <option value="--with-test" />
       </build>
       <build name="secp256k1" github="libbitcoin" repository="secp256k1" branch="version8" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--disable-tests" />
         <option value="--enable-experimental" />
         <option value="--enable-module-recovery" />
@@ -686,6 +691,7 @@
     <install>
       <!-- Building with our minimum (c++11 only) version of ICU. -->
       <build name="icu" version="55.2" parallel="true" >
+        <flag value="-w" />
         <!-- TODO: verify this with more recent ICU. -->
         <!-- Bug in ICU 55.2 build requires enable-draft. -->
         <option value="--enable-draft" />
@@ -699,6 +705,7 @@
         <option value="--disable-samples" />
       </build>
       <build name="boost" version="1.78.0" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--with-chrono" />
         <option value="--with-iostreams" />
         <option value="--with-json" />
@@ -904,6 +911,7 @@
 
     <install>
       <build name="zmq" version="4.3.5" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--disable-Werror" />
       </build>
       <build name="bitcoin-system" github="libbitcoin" repository="libbitcoin-system" branch="master" parallel="true" >
@@ -1106,6 +1114,7 @@
 
     <install>
       <build name="zmq" version="4.3.5" parallel="true" nuget="true" >
+        <flag value="-w" />
         <option value="--disable-Werror" />
       </build>
       <build name="bitcoin-protocol" github="libbitcoin" repository="libbitcoin-protocol" branch="master" parallel="true" >
@@ -1302,6 +1311,7 @@
 
     <install>
       <build name="icu" version="68.2" parallel="true" >
+        <flag value="-w" />
         <!-- Bug in ICU 55.2 build requires -enable-draft. -->
         <option value="--enable-rpath" />
         <option value="--enable-tools" />
diff --git a/templates/gsl.developer_setup.sh b/templates/gsl.developer_setup.sh
index 78f609e..3a48cce 100644
--- a/templates/gsl.developer_setup.sh
+++ b/templates/gsl.developer_setup.sh
@@ -293,7 +293,10 @@ $(my.prefix)unpack_from_tarball $ICU_ARCHIVE $ICU_URL gzip "$BUILD_ICU"
 .endmacro # unpack_from_tarball_icu
 .
 .macro build_from_tarball_icu(prefix)
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
 $(my.prefix)build_from_tarball $ICU_ARCHIVE source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" "$@"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_from_tarball_icu
 .
 .macro unpack_from_tarball_zlib(prefix)
@@ -301,7 +304,10 @@ $(my.prefix)unpack_from_tarball $ZLIB_ARCHIVE $ZLIB_URL gzip "$BUILD_ZLIB"
 .endmacro # unpack_from_tarball_zlib
 .
 .macro build_from_tarball_zlib(prefix)
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS ${ZLIB_FLAGS[@]}"
 $(my.prefix)build_from_tarball $ZLIB_ARCHIVE . "$PARALLEL" "$BUILD_ZLIB" "${ZLIB_OPTIONS[@]}" "$@"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_from_tarball_zlib
 .
 .macro unpack_from_tarball_png(prefix)
@@ -309,7 +315,10 @@ $(my.prefix)unpack_from_tarball $PNG_ARCHIVE $PNG_URL xz "$BUILD_PNG"
 .endmacro # unpack_from_tarball_png
 .
 .macro build_from_tarball_png(prefix)
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS ${PNG_FLAGS[@]}"
 $(my.prefix)build_from_tarball $PNG_ARCHIVE . "$PARALLEL" "$BUILD_PNG" "${PNG_OPTIONS[@]}" "$@"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_from_tarball_png
 .
 .macro unpack_from_tarball_qrencode(prefix)
@@ -317,7 +326,10 @@ $(my.prefix)unpack_from_tarball $QRENCODE_ARCHIVE $QRENCODE_URL bzip2 "$BUILD_QR
 .endmacro # unpack_from_tarball_qrencode
 .
 .macro build_from_tarball_qrencode(prefix)
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS ${QRENCODE_FLAGS[@]}"
 $(my.prefix)build_from_tarball $QRENCODE_ARCHIVE . "$PARALLEL" "$BUILD_QRENCODE" "${QRENCODE_OPTIONS[@]}" "$@"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_from_tarball_qrencode
 .
 .macro unpack_from_tarball_zmq(prefix)
@@ -325,7 +337,10 @@ $(my.prefix)unpack_from_tarball $ZMQ_ARCHIVE $ZMQ_URL gzip "$BUILD_ZMQ"
 .endmacro # unpack_from_tarball_zmq
 .
 .macro build_from_tarball_zmq(prefix)
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}"
 $(my.prefix)build_from_tarball $ZMQ_ARCHIVE . $PARALLEL "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" "$@"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_from_tarball_zmq
 .
 .macro unpack_from_tarball_mbedtls(prefix)
@@ -333,7 +348,10 @@ $(my.prefix)unpack_from_tarball $MBEDTLS_ARCHIVE $MBEDTLS_URL gzip "$BUILD_MBEDT
 .endmacro # unpack_from_tarball_mbedtls
 .
 .macro build_from_tarball_mbedtls(prefix)
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS ${MBEDTLS_FLAGS[@]}"
 $(my.prefix)build_from_tarball $MBEDTLS_ARCHIVE . $PARALLEL "$BUILD_MBEDTLS" "${MBEDTLS_OPTIONS[@]}" "$@"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_from_tarball_mbedtls
 .
 .macro unpack_boost(prefix)
@@ -341,7 +359,10 @@ $(my.prefix)unpack_from_tarball $BOOST_ARCHIVE $BOOST_URL bzip2 "$BUILD_BOOST"
 .endmacro # unpack_boost
 .
 .macro build_boost(prefix)
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
 $(my.prefix)build_from_tarball_boost $BOOST_ARCHIVE "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_boost
 .
 .macro create_github(build, prefix)
@@ -354,16 +375,24 @@ $(my.prefix)create_from_github $(my.build.github) $(my.build.repository) $(my.bu
 .   define my.build = build_github.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS $(my.flags)"
 $(my.prefix)build_from_github $(my.build.repository) "$(my.parallel)" false "$(my.conditional)" "$(my.options)" "$@"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_github_test
 .
 .macro build_github_test(build, prefix)
 .   define my.build = build_github_test.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
+local SAVE_CPPFLAGS="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS $(my.flags)"
 $(my.prefix)build_from_github $(my.build.repository) "$(my.parallel)" true "$(my.conditional)" "$(my.options)" "$@"
+export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_github_test
 .
 .macro define_create_local_copies(install)
@@ -543,6 +572,11 @@ function generate_setup(path_prefix)
             heading1("Initialize the build environment.")
             define_initialization_calls()
 
+            heading1("Define build flags.")
+            for _install.build as _build where count(_build.flag) > 0
+                define_build_flags(_config, _build)
+            endfor _build
+
             heading1("Define build options.")
             for _install.build as _build where count(_build.option) > 0
                  define_build_options(_config, _build)
diff --git a/templates/gsl.install-cmake.sh b/templates/gsl.install-cmake.sh
index 4c2d127..9eae5b8 100644
--- a/templates/gsl.install-cmake.sh
+++ b/templates/gsl.install-cmake.sh
@@ -325,51 +325,74 @@ make_jobs()
 .
 .macro build_from_tarball_icu()
     unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
     build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_icu
 .
 .macro build_from_tarball_zmq()
     unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}"
     build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_zmq
 .
 .macro build_from_tarball_mbedtls()
     unpack_from_tarball "$MBEDTLS_ARCHIVE" "$MBEDTLS_URL" gzip "$BUILD_MBEDTLS"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${MBEDTLS_FLAGS[@]}"
     build_from_tarball "$MBEDTLS_ARCHIVE" . "$PARALLEL" "$BUILD_MBEDTLS" "${MBEDTLS_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_mbedtls
 .
 .macro build_boost()
     unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
     build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_boost
 .
 .macro build_github(build)
 .   define my.build = build_github.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
     create_from_github $(my.build.github) $(my.build.repository) $(my.build.branch) "$(my.conditional)"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS $(my.flags)"
 .   if (is_bitcoin_dependency(my.build))
     build_from_github_cmake $(my.build.repository) "$(my.parallel)" false "$(my.conditional)" "$(my.options)" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
 .   else
     build_from_github $(my.build.repository) "$(my.parallel)" false "$(my.conditional)" "$(my.options)" $CUMULATIVE_FILTERED_ARGS
 .   endif
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_github
 .
 .macro build_github_cmake(build)
 .   define my.build = build_github_cmake.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
     create_from_github $(my.build.github) $(my.build.repository) $(my.build.branch) "$(my.conditional)"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS $(my.flags)"
     build_from_github_cmake $(my.build.repository) "$(my.parallel)" false "$(my.conditional)" "$(my.options)" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_github_cmake
 .
 .macro build_ci(build)
 .   define my.build = build_ci.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS $(my.flags)"
     if [[ ! ($CI == true) ]]; then
         create_from_github $(my.build.github) $(my.build.repository) $(my.build.branch) "$(my.conditional)"
 .   if (is_bitcoin_dependency(my.build))
@@ -384,6 +407,7 @@ make_jobs()
         pop_directory
         pop_directory
     fi
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_ci
 .
 .macro define_build_all(install)
@@ -495,6 +519,11 @@ function generate_installer_cmake(path_prefix)
             define_initialization_calls()
             write_line("remove_install_options")
 
+            heading1("Define build flags.")
+            for _install.build as _build where count(_build.flag) > 0
+                define_build_flags(_config, _build)
+            endfor _build
+
             heading1("Define build options.")
             for _install.build as _build where count(_build.option) > 0
                 define_build_options(_config, _build)
diff --git a/templates/gsl.install-cmakepresets.sh b/templates/gsl.install-cmakepresets.sh
index 75c07cd..53dd23e 100644
--- a/templates/gsl.install-cmakepresets.sh
+++ b/templates/gsl.install-cmakepresets.sh
@@ -428,53 +428,76 @@ make_jobs()
 .
 .macro build_from_tarball_icu()
     unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
     build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_icu
 .
 .macro build_from_tarball_zmq()
     unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}"
     build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_zmq
 .
 .macro build_from_tarball_mbedtls()
     unpack_from_tarball "$MBEDTLS_ARCHIVE" "$MBEDTLS_URL" gzip "$BUILD_MBEDTLS"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${MBEDTLS_FLAGS[@]}"
     build_from_tarball "$MBEDTLS_ARCHIVE" . "$PARALLEL" "$BUILD_MBEDTLS" "${MBEDTLS_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_mbedtls
 .
 .macro build_boost()
     unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
     build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_boost
 .
 .macro build_github(build)
 .   define my.build = build_github.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
     create_from_github $(my.build.github) $(my.build.repository) $(my.build.branch) "$(my.conditional)"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS $(my.flags)"
 .   if (is_bitcoin_dependency(my.build))
     display_message "$(my.build.repository) PRESET ${REPO_PRESET[$(my.build.repository)]}"
     build_from_github_cmake $(my.build.repository) ${REPO_PRESET[$(my.build.repository)]} "$(my.parallel)" false "$(my.conditional)" "$(my.options)" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
 .   else
     build_from_github $(my.build.repository) "$(my.parallel)" false "$(my.conditional)" "$(my.options)" $CUMULATIVE_FILTERED_ARGS
 .   endif
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_github
 .
 .macro build_github_cmake(build)
 .   define my.build = build_github_cmake.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
     create_from_github $(my.build.github) $(my.build.repository) $(my.build.branch) "$(my.conditional)"
     display_message "$(my.build.repository) PRESET ${REPO_PRESET[$(my.build.repository)]}"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS $(my.flags)"
     build_from_github_cmake $(my.build.repository) ${REPO_PRESET[$(my.build.repository)]} "$(my.parallel)" false  "$(my.conditional)" "$(my.options)" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_github_cmake
 .
 .macro build_ci(build)
 .   define my.build = build_ci.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS $(my.flags)"
     if [[ ! ($CI == true) ]]; then
         create_from_github $(my.build.github) $(my.build.repository) $(my.build.branch) "$(my.conditional)"
 .   if (is_bitcoin_dependency(my.build))
@@ -491,6 +514,7 @@ make_jobs()
         pop_directory
         pop_directory
     fi
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_ci
 .
 .macro define_build_all(install)
@@ -605,6 +629,11 @@ function generate_installer_cmake(path_prefix)
             define_initialization_calls()
             write_line("remove_install_options")
 
+            heading1("Define build flags.")
+            for _install.build as _build where count(_build.flag) > 0
+                define_build_flags(_config, _build)
+            endfor _build
+
             heading1("Define build options.")
             for _install.build as _build where count(_build.option) > 0
                 define_build_options(_config, _build)
diff --git a/templates/gsl.install.sh b/templates/gsl.install.sh
index bc6371b..3a4a4f5 100644
--- a/templates/gsl.install.sh
+++ b/templates/gsl.install.sh
@@ -164,38 +164,57 @@ make_jobs()
 .
 .macro build_from_tarball_icu()
     unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
     build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" "$@"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_icu
 .
 .macro build_from_tarball_zmq()
     unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}"
     build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" "$@"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_zmq
 .
 .macro build_from_tarball_mbedtls()
     unpack_from_tarball "$MBEDTLS_ARCHIVE" "$MBEDTLS_URL" gzip "$BUILD_MBEDTLS"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${MBEDTLS_FLAGS[@]}"
     build_from_tarball "$MBEDTLS_ARCHIVE" . "$PARALLEL" "$BUILD_MBEDTLS" "${MBEDTLS_OPTIONS[@]}" "$@"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_mbedtls
 .
 .macro build_boost()
     unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
     build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_boost
 .
 .macro build_github(build)
 .   define my.build = build_github.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
     create_from_github $(my.build.github) $(my.build.repository) $(my.build.branch) "$(my.conditional)"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS $(my.flags)"
     build_from_github $(my.build.repository) "$(my.parallel)" false "$(my.conditional)" "$(my.options)" "$@"
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_github
 .
 .macro build_ci(build)
 .   define my.build = build_ci.build
 .   define my.parallel = is_true(my.build.parallel) ?? "$PARALLEL" ? "$SEQUENTIAL"
 .   define my.conditional = is_true(my.build.conditional) ?? "$WITH_$(my.build.name:upper,c)" ? "yes"
+.   define my.flags = "${$(my.build.name:upper,c)_FLAGS[@]}"
 .   define my.options = "${$(my.build.name:upper,c)_OPTIONS[@]}"
+    local SAVE_CPPFLAGS="$CPPFLAGS"
+    export CPPFLAGS="$CPPFLAGS $(my.flags)"
     if [[ ! ($CI == true) ]]; then
         create_from_github $(my.build.github) $(my.build.repository) $(my.build.branch) "$(my.conditional)"
         build_from_github $(my.build.repository) "$(my.parallel)" true "$(my.conditional)" "$(my.options)" "$@"
@@ -206,6 +225,7 @@ make_jobs()
         pop_directory
         pop_directory
     fi
+    export CPPFLAGS=$SAVE_CPPFLAGS
 .endmacro # build_ci
 .
 .macro define_build_all(install)
@@ -314,6 +334,11 @@ function generate_installer(path_prefix)
             heading1("Initialize the build environment.")
             define_initialization_calls()
 
+            heading1("Define build flags.")
+            for _install.build as _build where count(_build.flag) > 0
+                define_build_flags(_config, _build)
+            endfor _build
+
             heading1("Define build options.")
             for _install.build as _build where count(_build.option) > 0
                 define_build_options(_config, _build)
diff --git a/templates/shared/common_install_shell_artifacts.gsl b/templates/shared/common_install_shell_artifacts.gsl
index 3e407a3..6487a3f 100644
--- a/templates/shared/common_install_shell_artifacts.gsl
+++ b/templates/shared/common_install_shell_artifacts.gsl
@@ -604,6 +604,21 @@ set_with_boost_prefix()
 
 .endmacro # define_set_with_boost_prefix
 .
+.macro define_build_flags(configuration, build)
+.   define my.configuration = define_build_flags.configuration
+.   define my.build = define_build_flags.build
+.   heading2("Define $(my.build.name) flags.")
+$(my.build.name:upper,c)_FLAGS=(
+.   for my.build.flag as _flag
+.       if (defined(my.configuration.cmake) & defined(_flag.cmake))
+"$(_flag.cmake)"$(last() ?? ")" ? " \\")
+.       else
+"$(_flag.value)"$(last() ?? ")" ? " \\")
+.       endif
+.   endfor _flag
+
+.endmacro # define_build_flags
+
 .macro define_build_options(configuration, build)
 .   define my.configuration = define_build_options.configuration
 .   define my.build = define_build_options.build

From f2f708508de5bd7bdaa4650e42817eb58f74efd9 Mon Sep 17 00:00:00 2001
From: Phillip Mienk <mienkphi@gmail.com>
Date: Mon, 19 Feb 2024 00:19:57 -0800
Subject: [PATCH 2/5] Scope flags to C++ to remove error related to C
 compilation via clang.

---
 templates/gsl.CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/gsl.CMakeLists.txt b/templates/gsl.CMakeLists.txt
index 534e120..8b8f4ac 100644
--- a/templates/gsl.CMakeLists.txt
+++ b/templates/gsl.CMakeLists.txt
@@ -990,7 +990,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "$(compiler_id(_flag.compiler))")
 .       endif
 $(my.indent)check_cxx_compiler_flag( "-$(_flag.name)" HAS_FLAG_$(_flag.name:upper) )
 $(my.indent)if ( HAS_FLAG_$(_flag.name:upper) )
-    $(my.indent)add_compile_options( "-$(_flag.name)" )
+    $(my.indent)add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-$(_flag.name)> )
 $(my.indent)else()
     $(my.indent)message( FATAL_ERROR "Compiler does not support -$(_flag.name)" )
 $(my.indent)endif()
@@ -1117,7 +1117,7 @@ $(my.indent)check_cxx_compiler_flag("$(my.flags)" $(my.symbol_prefix)$(my.compou
 
 $(my.indent)if ($(my.symbol_prefix)$(my.compound.name:upper))
 .   for my.compound.flag as _flag where defined(_flag.name) & !is_empty(_flag.name)
-    $(my.indent)add_compile_options( "-$(_flag.name)" )
+    $(my.indent)add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-$(_flag.name)> )
 .   endfor
 .   if defined(my.compound->program)
     $(my.indent)set( CMAKE_REQUIRED_FLAGS_PREV "${CMAKE_REQUIRED_FLAGS}" )

From f542a6f1563c370b8825260abdee779e9ffb0378 Mon Sep 17 00:00:00 2001
From: Phillip Mienk <mienkphi@gmail.com>
Date: Mon, 19 Feb 2024 00:21:21 -0800
Subject: [PATCH 3/5] Remove GNU specific symbol table removal from cmake
 presets to reduce warnings via clang.

---
 generate3.xml | 4 ++--
 generate4.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generate3.xml b/generate3.xml
index 8946299..50b48ec 100644
--- a/generate3.xml
+++ b/generate3.xml
@@ -2171,8 +2171,8 @@
     </configuration>
     <configuration name="gnu-optimized-size" description="Factored size optimization settings." hidden="true">
       <property name="cacheVariables" type="object">
-        <property name="CMAKE_C_FLAGS" value="$env{CMAKE_C_FLAGS} -Os -s" />
-        <property name="CMAKE_CXX_FLAGS" value="$env{CMAKE_CXX_FLAGS} -Os -s" />
+        <property name="CMAKE_C_FLAGS" value="$env{CMAKE_C_FLAGS} -Os" />
+        <property name="CMAKE_CXX_FLAGS" value="$env{CMAKE_CXX_FLAGS} -Os" />
       </property>
     </configuration>
     <configuration name="nix-gnu-debug-static" description="Debug build with static linking." hidden="false" display="*nix/GNU/Debug/Static">
diff --git a/generate4.xml b/generate4.xml
index b5a7518..b36b237 100644
--- a/generate4.xml
+++ b/generate4.xml
@@ -2264,8 +2264,8 @@
     </configuration>
     <configuration name="gnu-optimized-size" description="Factored size optimization settings." hidden="true">
       <property name="cacheVariables" type="object">
-        <property name="CMAKE_C_FLAGS" value="$env{CMAKE_C_FLAGS} -Os -s" />
-        <property name="CMAKE_CXX_FLAGS" value="$env{CMAKE_CXX_FLAGS} -Os -s" />
+        <property name="CMAKE_C_FLAGS" value="$env{CMAKE_C_FLAGS} -Os" />
+        <property name="CMAKE_CXX_FLAGS" value="$env{CMAKE_CXX_FLAGS} -Os" />
       </property>
     </configuration>
     <configuration name="nix-gnu-debug-static" description="Debug build with static linking." hidden="false" display="*nix/GNU/Debug/Static">

From 241e036b6c0618d1c689a202826327d75e43e558 Mon Sep 17 00:00:00 2001
From: Phillip Mienk <mienkphi@gmail.com>
Date: Tue, 20 Feb 2024 01:01:14 -0800
Subject: [PATCH 4/5] Unconditionally disable boost warnings.

---
 generate3.xml                                       |  2 --
 generate4.xml                                       |  3 ---
 templates/gsl.developer_setup.sh                    | 10 +++++++---
 templates/gsl.install-cmake.sh                      | 10 +++++++---
 templates/gsl.install-cmakepresets.sh               | 10 +++++++---
 templates/gsl.install.sh                            | 10 +++++++---
 templates/shared/common_install_shell_artifacts.gsl |  4 +++-
 7 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/generate3.xml b/generate3.xml
index 50b48ec..e2abeb5 100644
--- a/generate3.xml
+++ b/generate3.xml
@@ -137,7 +137,6 @@
     <install>
       <!-- Boost.system is necessary for detection, which is only required for test. -->
       <build name="boost" version="1.73.0" parallel="true" nuget="true" >
-        <flag value="-w" />
         <option value="--with-system" />
         <option value="--with-test" />
       </build>
@@ -391,7 +390,6 @@
         <option value="--disable-samples" />
       </build>
       <build name="boost" version="1.73.0" parallel="true" nuget="true" >
-        <flag value="-w" />
         <option value="--with-atomic" />
         <option value="--with-chrono" />
         <option value="--with-date_time" />
diff --git a/generate4.xml b/generate4.xml
index b36b237..3a73653 100644
--- a/generate4.xml
+++ b/generate4.xml
@@ -140,7 +140,6 @@
     <install>
       <!-- Boost.system is necessary for detection, which is only required for test. -->
       <build name="boost" version="1.78.0" parallel="true" nuget="true" >
-        <flag value="-w" />
         <option value="--with-system" />
         <option value="--with-test" />
       </build>
@@ -479,7 +478,6 @@
         <option value="--disable-samples" />
       </build>
       <build name="boost" version="1.78.0" parallel="true" nuget="true" >
-        <flag value="-w" />
         <option value="--with-chrono" />
         <option value="--with-iostreams" />
         <option value="--with-json" />
@@ -705,7 +703,6 @@
         <option value="--disable-samples" />
       </build>
       <build name="boost" version="1.78.0" parallel="true" nuget="true" >
-        <flag value="-w" />
         <option value="--with-chrono" />
         <option value="--with-iostreams" />
         <option value="--with-json" />
diff --git a/templates/gsl.developer_setup.sh b/templates/gsl.developer_setup.sh
index 3a48cce..30e4994 100644
--- a/templates/gsl.developer_setup.sh
+++ b/templates/gsl.developer_setup.sh
@@ -281,10 +281,14 @@ make_jobs()
 .   define_disable_exit_on_error()
 .endmacro # define_utility_functions
 .
-.macro define_build_functions()
+.macro define_build_functions(install)
+.   define my.install = define_build_functions.install
 .   define_tarball_functions("true")
 .   define_github_functions()
-.   define_boost_build_functions()
+.   if (count(my.install.build, count.name = "boost") > 0)
+.       define my.build = my.install->build(name = "boost")
+.       define_boost_build_functions(my.build)
+.   endif
 .   define_initialize_object_directory()
 .endmacro # define_build_functions
 .
@@ -561,7 +565,7 @@ function generate_setup(path_prefix)
             define_display_configuration(_repository, _install)
 
             heading1("Define build functions.")
-            define_build_functions()
+            define_build_functions(_install)
 
             heading1("The master download/clone/sync function.")
             define_create_local_copies(_install)
diff --git a/templates/gsl.install-cmake.sh b/templates/gsl.install-cmake.sh
index 9eae5b8..8f8cacf 100644
--- a/templates/gsl.install-cmake.sh
+++ b/templates/gsl.install-cmake.sh
@@ -316,11 +316,15 @@ make_jobs()
 .   define_disable_exit_on_error()
 .endmacro # define_utility_functions
 .
-.macro define_build_functions()
+.macro define_build_functions(install)
+.   define my.install = define_build_functions.install
 .   define_tarball_functions("false", "true")
 .   define_github_functions()
 .   define_cmake_analogous_functions()
-.   define_boost_build_functions()
+.   if (count(my.install.build, count.name = "boost") > 0)
+.       define my.build = my.install->build(name = "boost")
+.       define_boost_build_functions(my.build)
+.   endif
 .endmacro # define_build_functions
 .
 .macro build_from_tarball_icu()
@@ -510,7 +514,7 @@ function generate_installer_cmake(path_prefix)
             define_display_configuration(_repository, _install)
 
             heading1("Define build functions.")
-            define_build_functions()
+            define_build_functions(_install)
 
             heading1("The master build function.")
             define_build_all(_install)
diff --git a/templates/gsl.install-cmakepresets.sh b/templates/gsl.install-cmakepresets.sh
index 53dd23e..9df5826 100644
--- a/templates/gsl.install-cmakepresets.sh
+++ b/templates/gsl.install-cmakepresets.sh
@@ -419,11 +419,15 @@ make_jobs()
 .   define_disable_exit_on_error()
 .endmacro # define_utility_functions
 .
-.macro define_build_functions()
+.macro define_build_functions(install)
+.   define my.install = define_build_functions.install
 .   define_tarball_functions("false", "true")
 .   define_github_functions()
 .   define_cmake_analogous_functions()
-.   define_boost_build_functions()
+.   if (count(my.install.build, count.name = "boost") > 0)
+.       define my.build = my.install->build(name = "boost")
+.       define_boost_build_functions(my.build)
+.   endif
 .endmacro # define_build_functions
 .
 .macro build_from_tarball_icu()
@@ -620,7 +624,7 @@ function generate_installer_cmake(path_prefix)
             define_display_configuration(_repository, _install)
 
             heading1("Define build functions.")
-            define_build_functions()
+            define_build_functions(_install)
 
             heading1("The master build function.")
             define_build_all(_install)
diff --git a/templates/gsl.install.sh b/templates/gsl.install.sh
index 3a4a4f5..abac3d5 100644
--- a/templates/gsl.install.sh
+++ b/templates/gsl.install.sh
@@ -156,10 +156,14 @@ make_jobs()
 .   define_disable_exit_on_error()
 .endmacro # define_utility_functions
 .
-.macro define_build_functions()
+.macro define_build_functions(install)
+.   define my.install = define_build_functions.install
 .   define_tarball_functions("false", "true")
 .   define_github_functions()
-.   define_boost_build_functions()
+.   if (count(my.install.build, count.name = "boost") > 0)
+.       define my.build = my.install->build(name = "boost")
+.       define_boost_build_functions(my.build)
+.   endif
 .endmacro # define_build_functions
 .
 .macro build_from_tarball_icu()
@@ -326,7 +330,7 @@ function generate_installer(path_prefix)
             define_display_configuration(_repository, _install)
 
             heading1("Define build functions.")
-            define_build_functions()
+            define_build_functions(_install)
 
             heading1("The master build function.")
             define_build_all(_install)
diff --git a/templates/shared/common_install_shell_artifacts.gsl b/templates/shared/common_install_shell_artifacts.gsl
index 6487a3f..74ba066 100644
--- a/templates/shared/common_install_shell_artifacts.gsl
+++ b/templates/shared/common_install_shell_artifacts.gsl
@@ -1078,7 +1078,8 @@ initialize_boost_icu_configuration()
 
 .endmacro # define_boost_build_configuration_helpers
 .
-.macro define_boost_build_functions()
+.macro define_boost_build_functions(build)
+.   my.build = define_boost_build_functions.build
 .   define_boost_build_configuration_helpers()
 .
 # Because boost doesn't use autoconfig.
@@ -1145,6 +1146,7 @@ build_from_tarball_boost()
         "$BOOST_CXXFLAGS" \\
         "$BOOST_LINKFLAGS" \\
         "link=$BOOST_LINK" \\
+	"warnings=off" \\
         "boost.locale.iconv=$BOOST_ICU_ICONV" \\
         "boost.locale.posix=$BOOST_ICU_POSIX" \\
         "-sNO_BZIP2=1" \\

From 51b26bbb086c58d68049f256daec6fe3071a514e Mon Sep 17 00:00:00 2001
From: Phillip Mienk <mienkphi@gmail.com>
Date: Sat, 24 Feb 2024 23:39:23 -0800
Subject: [PATCH 5/5] Prebuild boost's build system (bjam) for denoted builds
 with warning suppression.

---
 generate4.xml                                       |  6 +++---
 templates/shared/common_install_shell_artifacts.gsl | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/generate4.xml b/generate4.xml
index 3a73653..ebd09d4 100644
--- a/generate4.xml
+++ b/generate4.xml
@@ -139,7 +139,7 @@
 
     <install>
       <!-- Boost.system is necessary for detection, which is only required for test. -->
-      <build name="boost" version="1.78.0" parallel="true" nuget="true" >
+      <build name="boost" version="1.78.0" parallel="true" nuget="true" prebuild="true" >
         <option value="--with-system" />
         <option value="--with-test" />
       </build>
@@ -477,7 +477,7 @@
         <option value="--disable-tests" />
         <option value="--disable-samples" />
       </build>
-      <build name="boost" version="1.78.0" parallel="true" nuget="true" >
+      <build name="boost" version="1.78.0" parallel="true" nuget="true" prebuild="true" >
         <option value="--with-chrono" />
         <option value="--with-iostreams" />
         <option value="--with-json" />
@@ -702,7 +702,7 @@
         <option value="--disable-tests" />
         <option value="--disable-samples" />
       </build>
-      <build name="boost" version="1.78.0" parallel="true" nuget="true" >
+      <build name="boost" version="1.78.0" parallel="true" nuget="true" prebuild="true" >
         <option value="--with-chrono" />
         <option value="--with-iostreams" />
         <option value="--with-json" />
diff --git a/templates/shared/common_install_shell_artifacts.gsl b/templates/shared/common_install_shell_artifacts.gsl
index 74ba066..ad16886 100644
--- a/templates/shared/common_install_shell_artifacts.gsl
+++ b/templates/shared/common_install_shell_artifacts.gsl
@@ -1128,7 +1128,17 @@ build_from_tarball_boost()
     display_message "BOOST_OPTIONS         : $*"
     display_message "--------------------------------------------------------------------"
 
+.
+.   if (defined(my.build.prebuild))
+    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 .
+
+.   endif
     ./bootstrap.sh \\
+.   if (defined(my.build.prebuild))
+        "--with-bjam=./b2" \\
+.   endif
         "--prefix=$PREFIX" \\
         "--with-icu=$ICU_PREFIX"