Merge pull request #1564 from pmienk/master

Regenerate artifacts.
libbitcoin · Dec 11, 2024 · af5a0dc · af5a0dc
2 parents 178513f + 20f6d37
commit af5a0dc
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "clang-15"
             flags: "-Og -fPIE"
             options: "--enable-isystem --enable-avx2 --enable-sse4"
@@ -39,6 +40,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             cc: "clang-15"
             flags: "-Os -fPIE"
             options: "--enable-isystem --enable-avx2"
@@ -53,6 +55,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "gcc-11"
             flags: "-Os -fPIE"
             options: "--enable-isystem --enable-sse4"
@@ -67,6 +70,7 @@ jobs:
             coverage: "cov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             cc: "gcc-11"
             flags: "-Os -g --coverage -fPIE"
             options: "--enable-isystem"
@@ -81,6 +85,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "clang"
             flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
             options: "--enable-isystem"
@@ -95,6 +100,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
             options: "--enable-isystem"
@@ -170,6 +176,7 @@ jobs:
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
           ${{ matrix.icu }}
+          ${{ matrix.secp256k1 }}
 
       - name: Coveralls Calculation
         if: ${{ matrix.coverage == 'cov' }}
@@ -250,6 +257,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "clang-15"
             flags: "-Og -fPIE"
             options: "-Denable-avx2=on -Denable-sse4=on"
@@ -264,6 +272,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on"
@@ -278,6 +287,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "gcc-11"
             flags: "-Os -fPIE"
             options: "-Denable-sse4=on"
@@ -292,6 +302,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             cc: "gcc-11"
             flags: "-Os -fPIE"
             options: ""
@@ -306,6 +317,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "clang"
             flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
             options: ""
@@ -320,6 +332,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
             options: ""
@@ -398,6 +411,7 @@ jobs:
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
           ${{ matrix.icu }}
+          ${{ matrix.secp256k1 }}
 
       - name: Coveralls Calculation
         if: ${{ matrix.coverage == 'cov' }}
@@ -489,6 +503,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "clang-15"
             flags: "-Og -fPIE"
             options: "-Denable-avx2=on -Denable-sse4=on"
@@ -504,6 +519,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on"
@@ -519,6 +535,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             cc: "gcc-11"
             flags: "-Os -fPIE"
             options: "-Denable-sse4=on"
@@ -598,6 +615,7 @@ jobs:
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
           ${{ matrix.icu }}
+          ${{ matrix.secp256k1 }}
 
       - name: Coveralls Calculation
         if: ${{ matrix.coverage == 'cov' }}

diff --git a/install-cmake.sh b/install-cmake.sh
@@ -227,8 +227,9 @@ display_help()
     display_message "                             accesses this feature, so if you do not intend to "
     display_message "                             use passphrase normalization this dependency can "
     display_message "                             be avoided."
-    display_message "  --build-icu              Builds ICU libraries."
-    display_message "  --build-boost            Builds Boost libraries."
+    display_message "  --build-icu              Build ICU libraries."
+    display_message "  --build-boost            Build Boost libraries."
+    display_message "  --build-secp256k1        Build libsecp256k1 libraries."
     display_message "  --build-dir=<path>       Location of downloaded and intermediate files."
     display_message "  --prefix=<absolute-path> Library install location (defaults to /usr/local)."
     display_message "  --disable-shared         Disables shared library builds."
@@ -257,9 +258,10 @@ parse_command_line_options()
             # Common project options.
             (--with-icu)            WITH_ICU="yes";;
 
-            # Custom build options (in the form of --build-<option>).
-            (--build-icu)           BUILD_ICU="yes";;
-            (--build-boost)         BUILD_BOOST="yes";;
+            # Custom build options.
+            (--build-icu)                              BUILD_ICU="yes";;
+            (--build-boost)                            BUILD_BOOST="yes";;
+            (--build-secp256k1)                        BUILD_SECP256K1="yes";;
 
             # Unique script options.
             (--build-dir=*)         BUILD_DIR="${OPTION#*=}";;
@@ -464,6 +466,7 @@ display_configuration()
     display_message "WITH_ICU              : $WITH_ICU"
     display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_BOOST           : $BUILD_BOOST"
+    display_message "BUILD_SECP256K1       : $BUILD_SECP256K1"
     display_message "BOOST_ROOT            : $BOOST_ROOT"
     display_message "BUILD_DIR                      : $BUILD_DIR"
     display_message "CUMULATIVE_FILTERED_ARGS       : $CUMULATIVE_FILTERED_ARGS"
@@ -916,10 +919,10 @@ build_all()
     export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
     build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
     export CPPFLAGS=$SAVE_CPPFLAGS
-    create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
+    create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
     local SAVE_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
-    build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
     export CPPFLAGS=$SAVE_CPPFLAGS
     local SAVE_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"

diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh
@@ -233,8 +233,9 @@ display_help()
     display_message "                             accesses this feature, so if you do not intend to "
     display_message "                             use passphrase normalization this dependency can "
     display_message "                             be avoided."
-    display_message "  --build-icu              Builds ICU libraries."
-    display_message "  --build-boost            Builds Boost libraries."
+    display_message "  --build-icu              Build ICU libraries."
+    display_message "  --build-boost            Build Boost libraries."
+    display_message "  --build-secp256k1        Build libsecp256k1 libraries."
     display_message "  --build-dir=<path>       Location of downloaded and intermediate files."
     display_message "  --preset=<label>         CMakePreset label."
     display_message "  --prefix=<absolute-path> Library install location (defaults to /usr/local)."
@@ -264,9 +265,10 @@ parse_command_line_options()
             # Common project options.
             (--with-icu)            WITH_ICU="yes";;
 
-            # Custom build options (in the form of --build-<option>).
-            (--build-icu)           BUILD_ICU="yes";;
-            (--build-boost)         BUILD_BOOST="yes";;
+            # Custom build options.
+            (--build-icu)                              BUILD_ICU="yes";;
+            (--build-boost)                            BUILD_BOOST="yes";;
+            (--build-secp256k1)                        BUILD_SECP256K1="yes";;
 
             # Unique script options.
             (--build-dir=*)         BUILD_DIR="${OPTION#*=}";;
@@ -503,6 +505,7 @@ display_configuration()
     display_message "WITH_ICU              : $WITH_ICU"
     display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_BOOST           : $BUILD_BOOST"
+    display_message "BUILD_SECP256K1       : $BUILD_SECP256K1"
     display_message "BOOST_ROOT            : $BOOST_ROOT"
     display_message "BUILD_DIR                      : $BUILD_DIR"
     display_message "PRESET_ID                      : $PRESET_ID"
@@ -959,10 +962,10 @@ build_all()
     export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
     build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
     export CPPFLAGS=$SAVE_CPPFLAGS
-    create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
+    create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
     local SAVE_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
-    build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
     export CPPFLAGS=$SAVE_CPPFLAGS
     local SAVE_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"

diff --git a/install.sh b/install.sh
@@ -227,8 +227,9 @@ display_help()
     display_message "                             accesses this feature, so if you do not intend to "
     display_message "                             use passphrase normalization this dependency can "
     display_message "                             be avoided."
-    display_message "  --build-icu              Builds ICU libraries."
-    display_message "  --build-boost            Builds Boost libraries."
+    display_message "  --build-icu              Build ICU libraries."
+    display_message "  --build-boost            Build Boost libraries."
+    display_message "  --build-secp256k1        Build libsecp256k1 libraries."
     display_message "  --build-dir=<path>       Location of downloaded and intermediate files."
     display_message "  --prefix=<absolute-path> Library install location (defaults to /usr/local)."
     display_message "  --disable-shared         Disables shared library builds."
@@ -257,9 +258,10 @@ parse_command_line_options()
             # Common project options.
             (--with-icu)            WITH_ICU="yes";;
 
-            # Custom build options (in the form of --build-<option>).
-            (--build-icu)           BUILD_ICU="yes";;
-            (--build-boost)         BUILD_BOOST="yes";;
+            # Custom build options.
+            (--build-icu)                              BUILD_ICU="yes";;
+            (--build-boost)                            BUILD_BOOST="yes";;
+            (--build-secp256k1)                        BUILD_SECP256K1="yes";;
 
             # Unique script options.
             (--build-dir=*)    BUILD_DIR="${OPTION#*=}";;
@@ -409,6 +411,7 @@ display_configuration()
     display_message "WITH_ICU              : $WITH_ICU"
     display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_BOOST           : $BUILD_BOOST"
+    display_message "BUILD_SECP256K1       : $BUILD_SECP256K1"
     display_message "BOOST_ROOT            : $BOOST_ROOT"
     display_message "BUILD_DIR             : $BUILD_DIR"
     display_message "PREFIX                : $PREFIX"
@@ -791,10 +794,10 @@ build_all()
     export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
     build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
     export CPPFLAGS=$SAVE_CPPFLAGS
-    create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
+    create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
     local SAVE_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
-    build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" "$@"
+    build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" "$@"
     export CPPFLAGS=$SAVE_CPPFLAGS
     local SAVE_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"