Skip to content

Commit 77c9bab

Browse files
pmienkpmienk
authored
Merge pull request #398 from pmienk/master
Reduce explicit dependencies, update ICU installation to 78.2.
2 parents 1631ee1 + f0379da commit 77c9bab

File tree

4 files changed

+38
-32
lines changed

4 files changed

+38
-32
lines changed

‎generate4.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
<dependency name="boost_thread" />
3838
<dependency name="boost_url" />
3939
<dependency name="boost_unit_test_framework" option="tests" />
40-
<dependency name="pthread" system_exclude="android" />
41-
<dependency name="rt" function="clock_gettime" system="linux" system_exclude="android" />
40+
<!-- <dependency name="pthread" system_exclude="android" /> -->
41+
<!-- <dependency name="rt" function="clock_gettime" system="linux" system_exclude="android" /> -->
4242
<dependency name="icu-i18n" version="55.2" unprefixed="true" option="icu" />
4343
<!-- TODO: verify this with more recent ICU. -->
4444
<!-- -ldl is missing from icu package config. -->
45-
<dependency name="dl" function="dlopen" system="linux" optionXXX="icu" />
45+
<!--<dependency name="dl" function="dlopen" system="linux" optionXXX="icu" />-->
4646
<!-- Arbitrary minimum version, current nuget package is v0.6.1. -->
4747
<dependency name="secp256k1" version="0.5.1.0" />
4848

@@ -153,12 +153,12 @@
153153
<!-- boost_locale creates a dependency on boost_thread for thread local storage. -->
154154
<library name="boost_thread" />
155155
<library name="boost_url" />
156-
<library name="pthread" />
157-
<library name="rt" />
156+
<!--<library name="pthread" />-->
157+
<!-- <library name="rt" /> -->
158158
<library name="icu-i18n" />
159159
<!-- TODO: verify this with more recent ICU. -->
160160
<!-- -ldl is missing from icu package config. -->
161-
<library name="dl" />
161+
<!-- <library name="dl" /> -->
162162
<library name="secp256k1" />
163163
<headers path="include" />
164164
<sources path="src" />
@@ -184,7 +184,7 @@
184184

185185
<install>
186186
<!-- Building with our minimum (c++11 only) version of ICU. -->
187-
<build name="icu" version="55.2" parallel="true" presentation="ICU" conditional="true" >
187+
<build name="icu" version="78.2" parallel="true" presentation="ICU" conditional="true" >
188188
<flag value="-w" />
189189
<!-- TODO: verify this with more recent ICU. -->
190190
<!-- Bug in ICU 55.2 build requires -enable-draft. -->
@@ -248,10 +248,10 @@
248248
<job build="all"
249249
system="osx"
250250
assert="ndebug" link="dynamic" optimization="size">
251-
<axis name="llvm" value="" />
251+
<axis name="llvm" value="" />
252252
<axis name="boost" value="build" />
253253
<axis name="secp256k1" value="build" />
254-
<!-- <axis name="icu" value="with" /> -->
254+
<axis name="icu" value="with" />
255255
<option autotools="--enable-isystem" />
256256
</job>
257257

@@ -261,7 +261,7 @@
261261
<axis name="llvm" value="" />
262262
<axis name="boost" value="build" />
263263
<axis name="secp256k1" value="build" />
264-
<!-- <axis name="icu" value="build" /> -->
264+
<axis name="icu" value="build" />
265265
<option autotools="--enable-isystem" />
266266
</job>
267267

@@ -424,7 +424,7 @@
424424

425425
<install>
426426
<!-- Building with our minimum (c++11 only) version of ICU. -->
427-
<build name="icu" version="55.2" parallel="true" presentation="ICU" conditional="true" >
427+
<build name="icu" version="78.2" parallel="true" presentation="ICU" conditional="true" >
428428
<flag value="-w" />
429429
<!-- TODO: verify this with more recent ICU. -->
430430
<!-- Bug in ICU 55.2 build requires enable-draft. -->
@@ -489,7 +489,7 @@
489489
assert="ndebug" link="dynamic" optimization="size">
490490
<axis name="llvm" value="" />
491491
<axis name="boost" value="build" />
492-
<!-- <axis name="icu" value="with" /> -->
492+
<axis name="icu" value="with" />
493493
<axis name="secp256k1" value="build" />
494494
<option autotools="--enable-isystem" />
495495
</job>
@@ -499,7 +499,7 @@
499499
assert="ndebug" link="static" optimization="size">
500500
<axis name="llvm" value="" />
501501
<axis name="boost" value="build" />
502-
<!-- <axis name="icu" value="build" /> -->
502+
<axis name="icu" value="build" />
503503
<axis name="secp256k1" value="build" />
504504
<option autotools="--enable-isystem" />
505505
</job>
@@ -699,7 +699,7 @@
699699
assert="ndebug" link="dynamic" optimization="size">
700700
<axis name="llvm" value="" />
701701
<axis name="boost" value="build" />
702-
<!-- <axis name="icu" value="with" /> -->
702+
<axis name="icu" value="with" />
703703
<axis name="secp256k1" value="build" />
704704
<axis name="zmq" value="build" />
705705
<option autotools="--enable-isystem" />
@@ -710,7 +710,7 @@
710710
assert="ndebug" link="static" optimization="size">
711711
<axis name="llvm" value="" />
712712
<axis name="boost" value="build" />
713-
<!-- <axis name="icu" value="build" /> -->
713+
<axis name="icu" value="build" />
714714
<axis name="secp256k1" value="build" />
715715
<axis name="zmq" value="build" />
716716
<option autotools="--enable-isystem" />
@@ -1062,7 +1062,7 @@
10621062
</make>
10631063

10641064
<install>
1065-
<build name="icu" version="68.2" parallel="true" presentation="ICU" conditional="true" >
1065+
<build name="icu" version="78.2" parallel="true" presentation="ICU" conditional="true" >
10661066
<flag value="-w" />
10671067
<!-- Bug in ICU 55.2 build requires -enable-draft. -->
10681068
<option value="--enable-rpath" />
@@ -1288,7 +1288,7 @@
12881288
assert="ndebug" link="dynamic" optimization="size">
12891289
<axis name="llvm" value="" />
12901290
<axis name="boost" value="build" />
1291-
<!-- <axis name="icu" value="build" /> -->
1291+
<axis name="icu" value="with" />
12921292
<axis name="secp256k1" value="build" />
12931293
<option autotools="--enable-isystem" />
12941294
</job>
@@ -1298,7 +1298,7 @@
12981298
assert="ndebug" link="static" optimization="size">
12991299
<axis name="llvm" value="" />
13001300
<axis name="boost" value="build" />
1301-
<!-- <axis name="icu" value="build" /> -->
1301+
<axis name="icu" value="build" />
13021302
<axis name="secp256k1" value="build" />
13031303
<option autotools="--enable-isystem" />
13041304
</job>
@@ -1502,7 +1502,7 @@
15021502
assert="ndebug" link="dynamic" optimization="size">
15031503
<axis name="llvm" value="" />
15041504
<axis name="boost" value="build" />
1505-
<!-- <axis name="icu" value="build" /> -->
1505+
<axis name="icu" value="with" />
15061506
<axis name="secp256k1" value="build" />
15071507
<option autotools="--enable-isystem" />
15081508
</job>
@@ -1512,7 +1512,7 @@
15121512
assert="ndebug" link="static" optimization="size">
15131513
<axis name="llvm" value="" />
15141514
<axis name="boost" value="build" />
1515-
<!-- <axis name="icu" value="build" /> -->
1515+
<axis name="icu" value="build" />
15161516
<axis name="secp256k1" value="build" />
15171517
<option autotools="--enable-isystem" />
15181518
</job>
@@ -1704,7 +1704,7 @@
17041704
assert="ndebug" link="dynamic" optimization="size">
17051705
<axis name="llvm" value="" />
17061706
<axis name="boost" value="build" />
1707-
<!-- <axis name="icu" value="build" /> -->
1707+
<axis name="icu" value="with" />
17081708
<axis name="secp256k1" value="build" />
17091709
<option autotools="--enable-isystem" />
17101710
</job>
@@ -1714,7 +1714,7 @@
17141714
assert="ndebug" link="static" optimization="size">
17151715
<axis name="llvm" value="" />
17161716
<axis name="boost" value="build" />
1717-
<!-- <axis name="icu" value="build" /> -->
1717+
<axis name="icu" value="build" />
17181718
<axis name="secp256k1" value="build" />
17191719
<option autotools="--enable-isystem" />
17201720
</job>

‎templates/gsl.code-workspace‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ endfunction
2525

2626
function is_libbitcoin_project(build)
2727
define my.build = is_libbitcoin_project.build
28-
return defined(my.build.github) & (my.build.github = "libbitcoin")
28+
return defined(my.build.github) & starts_with(my.build.repository, "libbitcoin")
2929
endfunction
3030

3131
# Generation

‎templates/gsl.developer_setup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ handle_custom_options()
144144

145145
if [[ $BUILD_TAG ]]; then
146146
. for my.install.build as _build where defined(_build.branch)
147-
. if (starts_with(_build.name, "bitcoin-") & (is_github_build(_build)) & starts_with("libbitcoin", _build.github))
147+
. if (starts_with(_build.name, "bitcoin-") & (is_github_build(_build)))
148148
$(_build.name:upper,c)_BRANCH=${BUILD_TAG}
149149
. endif
150150
. endfor

‎templates/shared/common_install_shell_artifacts.gsl‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ function get_icu_file(install)
9191
trace1("get_icu_file:get_archive_version() = []")
9292
return
9393
endif
94-
define my.underscore_version = string.convch(my.version, ".", "_")
95-
return "icu4c-$(my.underscore_version)-src.tgz"
94+
# define my.underscore_version = string.convch(my.version ".", "_")
95+
# return "icu4c-$(my.underscore_version)-src.tgz"
96+
return "icu4c-$(my.version)-sources.tgz"
9697
endfunction
9798

9899
function get_icu_url(install)
@@ -108,9 +109,10 @@ function get_icu_url(install)
108109
trace1("get_icu_url:get_icu_file() = []")
109110
return
110111
endif
111-
define my.dash_version = string.convch(my.version, ".", "-")
112+
# define my.dash_version = string.convch(my.version, ".", "-")
112113
define my.base_url = "https\://github.com/unicode-org/icu/releases/download"
113-
define my.url = "$(my.base_url)/release-$(my.dash_version)/$(my.archive)"
114+
# define my.url = "$(my.base_url)/release-$(my.dash_version)/$(my.archive)"
115+
define my.url = "$(my.base_url)/release-$(my.version)/$(my.archive)"
114116
trace1("get_icu_url = $(my.url)")
115117
return my.url
116118
endfunction
@@ -786,11 +788,14 @@ initialize_icu_packages()
786788
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
787789
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
788790
# renaming or important features, so we can't use that.
789-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
791+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
792+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
790793
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
791794

792-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
793-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
795+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
796+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
797+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
798+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
794799
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
795800
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
796801
fi
@@ -1150,7 +1155,8 @@ build_from_tarball_boost()
11501155
# "-sICU_LINK=${ICU_LIBS[*]}"
11511156

11521157
./b2 install \\
1153-
"cxxstd=11" \\
1158+
. #
1159+
"cxxstd=20" \\
11541160
"variant=release" \\
11551161
"threading=multi" \\
11561162
"$BOOST_TOOLSET" \\

0 commit comments

Comments
 (0)