Skip to content

Commit af5a0dc

Browse files
evoskuilevoskuil
authored
Merge pull request #1564 from pmienk/master
Regenerate artifacts.
2 parents 178513f + 20f6d37 commit af5a0dc

4 files changed

Lines changed: 48 additions & 21 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
coverage: "nocov"
2626
boost: "--build-boost"
2727
icu: ""
28+
secp256k1: "--build-secp256k1"
2829
cc: "clang-15"
2930
flags: "-Og -fPIE"
3031
options: "--enable-isystem --enable-avx2 --enable-sse4"
@@ -39,6 +40,7 @@ jobs:
3940
coverage: "nocov"
4041
boost: "--build-boost"
4142
icu: "--build-icu --with-icu"
43+
secp256k1: "--build-secp256k1"
4244
cc: "clang-15"
4345
flags: "-Os -fPIE"
4446
options: "--enable-isystem --enable-avx2"
@@ -53,6 +55,7 @@ jobs:
5355
coverage: "nocov"
5456
boost: "--build-boost"
5557
icu: ""
58+
secp256k1: "--build-secp256k1"
5659
cc: "gcc-11"
5760
flags: "-Os -fPIE"
5861
options: "--enable-isystem --enable-sse4"
@@ -67,6 +70,7 @@ jobs:
6770
coverage: "cov"
6871
boost: "--build-boost"
6972
icu: "--build-icu --with-icu"
73+
secp256k1: "--build-secp256k1"
7074
cc: "gcc-11"
7175
flags: "-Os -g --coverage -fPIE"
7276
options: "--enable-isystem"
@@ -81,6 +85,7 @@ jobs:
8185
coverage: "nocov"
8286
boost: "--build-boost"
8387
icu: ""
88+
secp256k1: "--build-secp256k1"
8489
cc: "clang"
8590
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
8691
options: "--enable-isystem"
@@ -95,6 +100,7 @@ jobs:
95100
coverage: "nocov"
96101
boost: "--build-boost"
97102
icu: ""
103+
secp256k1: "--build-secp256k1"
98104
cc: "clang"
99105
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
100106
options: "--enable-isystem"
@@ -170,6 +176,7 @@ jobs:
170176
${{ env.ASSERT_NDEBUG }}
171177
${{ matrix.boost }}
172178
${{ matrix.icu }}
179+
${{ matrix.secp256k1 }}
173180
174181
- name: Coveralls Calculation
175182
if: ${{ matrix.coverage == 'cov' }}
@@ -250,6 +257,7 @@ jobs:
250257
coverage: "nocov"
251258
boost: "--build-boost"
252259
icu: ""
260+
secp256k1: "--build-secp256k1"
253261
cc: "clang-15"
254262
flags: "-Og -fPIE"
255263
options: "-Denable-avx2=on -Denable-sse4=on"
@@ -264,6 +272,7 @@ jobs:
264272
coverage: "nocov"
265273
boost: "--build-boost"
266274
icu: "--build-icu --with-icu"
275+
secp256k1: "--build-secp256k1"
267276
cc: "clang-15"
268277
flags: "-Os -fPIE"
269278
options: "-Denable-avx2=on"
@@ -278,6 +287,7 @@ jobs:
278287
coverage: "nocov"
279288
boost: "--build-boost"
280289
icu: ""
290+
secp256k1: "--build-secp256k1"
281291
cc: "gcc-11"
282292
flags: "-Os -fPIE"
283293
options: "-Denable-sse4=on"
@@ -292,6 +302,7 @@ jobs:
292302
coverage: "nocov"
293303
boost: "--build-boost"
294304
icu: "--build-icu --with-icu"
305+
secp256k1: "--build-secp256k1"
295306
cc: "gcc-11"
296307
flags: "-Os -fPIE"
297308
options: ""
@@ -306,6 +317,7 @@ jobs:
306317
coverage: "nocov"
307318
boost: "--build-boost"
308319
icu: ""
320+
secp256k1: "--build-secp256k1"
309321
cc: "clang"
310322
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
311323
options: ""
@@ -320,6 +332,7 @@ jobs:
320332
coverage: "nocov"
321333
boost: "--build-boost"
322334
icu: ""
335+
secp256k1: "--build-secp256k1"
323336
cc: "clang"
324337
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
325338
options: ""
@@ -398,6 +411,7 @@ jobs:
398411
${{ env.ASSERT_NDEBUG }}
399412
${{ matrix.boost }}
400413
${{ matrix.icu }}
414+
${{ matrix.secp256k1 }}
401415
402416
- name: Coveralls Calculation
403417
if: ${{ matrix.coverage == 'cov' }}
@@ -489,6 +503,7 @@ jobs:
489503
coverage: "nocov"
490504
boost: "--build-boost"
491505
icu: ""
506+
secp256k1: "--build-secp256k1"
492507
cc: "clang-15"
493508
flags: "-Og -fPIE"
494509
options: "-Denable-avx2=on -Denable-sse4=on"
@@ -504,6 +519,7 @@ jobs:
504519
coverage: "nocov"
505520
boost: "--build-boost"
506521
icu: "--build-icu --with-icu"
522+
secp256k1: "--build-secp256k1"
507523
cc: "clang-15"
508524
flags: "-Os -fPIE"
509525
options: "-Denable-avx2=on"
@@ -519,6 +535,7 @@ jobs:
519535
coverage: "nocov"
520536
boost: "--build-boost"
521537
icu: ""
538+
secp256k1: "--build-secp256k1"
522539
cc: "gcc-11"
523540
flags: "-Os -fPIE"
524541
options: "-Denable-sse4=on"
@@ -598,6 +615,7 @@ jobs:
598615
${{ env.ASSERT_NDEBUG }}
599616
${{ matrix.boost }}
600617
${{ matrix.icu }}
618+
${{ matrix.secp256k1 }}
601619
602620
- name: Coveralls Calculation
603621
if: ${{ matrix.coverage == 'cov' }}

‎install-cmake.sh‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,9 @@ display_help()
227227
display_message " accesses this feature, so if you do not intend to "
228228
display_message " use passphrase normalization this dependency can "
229229
display_message " be avoided."
230-
display_message " --build-icu Builds ICU libraries."
231-
display_message " --build-boost Builds Boost libraries."
230+
display_message " --build-icu Build ICU libraries."
231+
display_message " --build-boost Build Boost libraries."
232+
display_message " --build-secp256k1 Build libsecp256k1 libraries."
232233
display_message " --build-dir=<path> Location of downloaded and intermediate files."
233234
display_message " --prefix=<absolute-path> Library install location (defaults to /usr/local)."
234235
display_message " --disable-shared Disables shared library builds."
@@ -257,9 +258,10 @@ parse_command_line_options()
257258
# Common project options.
258259
(--with-icu) WITH_ICU="yes";;
259260

260-
# Custom build options (in the form of --build-<option>).
261-
(--build-icu) BUILD_ICU="yes";;
262-
(--build-boost) BUILD_BOOST="yes";;
261+
# Custom build options.
262+
(--build-icu) BUILD_ICU="yes";;
263+
(--build-boost) BUILD_BOOST="yes";;
264+
(--build-secp256k1) BUILD_SECP256K1="yes";;
263265

264266
# Unique script options.
265267
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
@@ -464,6 +466,7 @@ display_configuration()
464466
display_message "WITH_ICU : $WITH_ICU"
465467
display_message "BUILD_ICU : $BUILD_ICU"
466468
display_message "BUILD_BOOST : $BUILD_BOOST"
469+
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
467470
display_message "BOOST_ROOT : $BOOST_ROOT"
468471
display_message "BUILD_DIR : $BUILD_DIR"
469472
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
@@ -916,10 +919,10 @@ build_all()
916919
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
917920
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
918921
export CPPFLAGS=$SAVE_CPPFLAGS
919-
create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
922+
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
920923
local SAVE_CPPFLAGS="$CPPFLAGS"
921924
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
922-
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
925+
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
923926
export CPPFLAGS=$SAVE_CPPFLAGS
924927
local SAVE_CPPFLAGS="$CPPFLAGS"
925928
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"

‎install-cmakepresets.sh‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,9 @@ display_help()
233233
display_message " accesses this feature, so if you do not intend to "
234234
display_message " use passphrase normalization this dependency can "
235235
display_message " be avoided."
236-
display_message " --build-icu Builds ICU libraries."
237-
display_message " --build-boost Builds Boost libraries."
236+
display_message " --build-icu Build ICU libraries."
237+
display_message " --build-boost Build Boost libraries."
238+
display_message " --build-secp256k1 Build libsecp256k1 libraries."
238239
display_message " --build-dir=<path> Location of downloaded and intermediate files."
239240
display_message " --preset=<label> CMakePreset label."
240241
display_message " --prefix=<absolute-path> Library install location (defaults to /usr/local)."
@@ -264,9 +265,10 @@ parse_command_line_options()
264265
# Common project options.
265266
(--with-icu) WITH_ICU="yes";;
266267

267-
# Custom build options (in the form of --build-<option>).
268-
(--build-icu) BUILD_ICU="yes";;
269-
(--build-boost) BUILD_BOOST="yes";;
268+
# Custom build options.
269+
(--build-icu) BUILD_ICU="yes";;
270+
(--build-boost) BUILD_BOOST="yes";;
271+
(--build-secp256k1) BUILD_SECP256K1="yes";;
270272

271273
# Unique script options.
272274
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
@@ -503,6 +505,7 @@ display_configuration()
503505
display_message "WITH_ICU : $WITH_ICU"
504506
display_message "BUILD_ICU : $BUILD_ICU"
505507
display_message "BUILD_BOOST : $BUILD_BOOST"
508+
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
506509
display_message "BOOST_ROOT : $BOOST_ROOT"
507510
display_message "BUILD_DIR : $BUILD_DIR"
508511
display_message "PRESET_ID : $PRESET_ID"
@@ -959,10 +962,10 @@ build_all()
959962
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
960963
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
961964
export CPPFLAGS=$SAVE_CPPFLAGS
962-
create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
965+
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
963966
local SAVE_CPPFLAGS="$CPPFLAGS"
964967
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
965-
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
968+
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
966969
export CPPFLAGS=$SAVE_CPPFLAGS
967970
local SAVE_CPPFLAGS="$CPPFLAGS"
968971
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"

‎install.sh‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,9 @@ display_help()
227227
display_message " accesses this feature, so if you do not intend to "
228228
display_message " use passphrase normalization this dependency can "
229229
display_message " be avoided."
230-
display_message " --build-icu Builds ICU libraries."
231-
display_message " --build-boost Builds Boost libraries."
230+
display_message " --build-icu Build ICU libraries."
231+
display_message " --build-boost Build Boost libraries."
232+
display_message " --build-secp256k1 Build libsecp256k1 libraries."
232233
display_message " --build-dir=<path> Location of downloaded and intermediate files."
233234
display_message " --prefix=<absolute-path> Library install location (defaults to /usr/local)."
234235
display_message " --disable-shared Disables shared library builds."
@@ -257,9 +258,10 @@ parse_command_line_options()
257258
# Common project options.
258259
(--with-icu) WITH_ICU="yes";;
259260

260-
# Custom build options (in the form of --build-<option>).
261-
(--build-icu) BUILD_ICU="yes";;
262-
(--build-boost) BUILD_BOOST="yes";;
261+
# Custom build options.
262+
(--build-icu) BUILD_ICU="yes";;
263+
(--build-boost) BUILD_BOOST="yes";;
264+
(--build-secp256k1) BUILD_SECP256K1="yes";;
263265

264266
# Unique script options.
265267
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
@@ -409,6 +411,7 @@ display_configuration()
409411
display_message "WITH_ICU : $WITH_ICU"
410412
display_message "BUILD_ICU : $BUILD_ICU"
411413
display_message "BUILD_BOOST : $BUILD_BOOST"
414+
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
412415
display_message "BOOST_ROOT : $BOOST_ROOT"
413416
display_message "BUILD_DIR : $BUILD_DIR"
414417
display_message "PREFIX : $PREFIX"
@@ -791,10 +794,10 @@ build_all()
791794
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
792795
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
793796
export CPPFLAGS=$SAVE_CPPFLAGS
794-
create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
797+
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
795798
local SAVE_CPPFLAGS="$CPPFLAGS"
796799
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
797-
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" "$@"
800+
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" "$@"
798801
export CPPFLAGS=$SAVE_CPPFLAGS
799802
local SAVE_CPPFLAGS="$CPPFLAGS"
800803
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"

0 commit comments

Comments
 (0)