Skip to content

Commit e4a1612

Browse files
pmienkpmienk
authored
Merge pull request #649 from pmienk/master
Update ICU to version 78.2 (installation, not minimum supported versi…
2 parents dfd073a + 5f0a14f commit e4a1612

6 files changed

Lines changed: 38 additions & 31 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
coverage: "nocov"
9494
detectcpuflags: "ignore"
9595
boost: "--build-boost"
96-
icu: ""
96+
icu: "--with-icu"
9797
llvm: ""
9898
secp256k1: "--build-secp256k1"
9999
cc: "clang"
@@ -110,14 +110,14 @@ jobs:
110110
coverage: "nocov"
111111
detectcpuflags: "ignore"
112112
boost: "--build-boost"
113-
icu: ""
113+
icu: "--build-icu --with-icu"
114114
llvm: ""
115115
secp256k1: "--build-secp256k1"
116116
cc: "clang"
117117
flags: "-Os -fvisibility=hidden -fPIE"
118118
options: "--enable-isystem"
119119
packager: "brew"
120-
packages: "icu4c"
120+
packages: ""
121121

122122

123123
runs-on: ${{ matrix.os }}
@@ -364,7 +364,7 @@ jobs:
364364
coverage: "nocov"
365365
detectcpuflags: "ignore"
366366
boost: "--build-boost"
367-
icu: ""
367+
icu: "--with-icu"
368368
llvm: ""
369369
secp256k1: "--build-secp256k1"
370370
cc: "clang"
@@ -381,14 +381,14 @@ jobs:
381381
coverage: "nocov"
382382
detectcpuflags: "ignore"
383383
boost: "--build-boost"
384-
icu: ""
384+
icu: "--build-icu --with-icu"
385385
llvm: ""
386386
secp256k1: "--build-secp256k1"
387387
cc: "clang"
388388
flags: "-Os -fvisibility=hidden -fPIE"
389389
options: ""
390390
packager: "brew"
391-
packages: "icu4c"
391+
packages: ""
392392

393393

394394
runs-on: ${{ matrix.os }}

‎builds/cmake/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,10 @@ if (with-tests)
295295
"../../test/test.cpp"
296296
"../../test/test.hpp"
297297
"../../test/endpoints/README.md"
298-
"../../test/endpoints/bitcoind_rpc.py"
299-
"../../test/endpoints/configuration.py"
300-
"../../test/endpoints/electrum.py"
301-
"../../test/endpoints/native.py"
298+
"../../test/endpoints/conftest.py"
299+
"../../test/endpoints/test_bitcoind_rpc.py"
300+
"../../test/endpoints/test_electrum.py"
301+
"../../test/endpoints/test_native.py"
302302
"../../test/endpoints/utils.py"
303303
"../../test/parsers/bitcoind_query.cpp"
304304
"../../test/parsers/bitcoind_target.cpp"

‎builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@
118118
<Import Project="$(ProjectDir)$(ProjectName).props" />
119119
</ImportGroup>
120120
<ItemGroup>
121-
<ClCompile Include="..\..\..\..\test\configuration.cpp">
122-
<ObjectFileName>$(IntDir)test_configuration.obj</ObjectFileName>
123-
</ClCompile>
121+
<ClCompile Include="..\..\..\..\test\configuration.cpp" />
124122
<ClCompile Include="..\..\..\..\test\error.cpp" />
125123
<ClCompile Include="..\..\..\..\test\estimator.cpp" />
126124
<ClCompile Include="..\..\..\..\test\main.cpp" />

‎install-cmake.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)
6767

6868
# ICU archive.
6969
#------------------------------------------------------------------------------
70-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
71-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
70+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
71+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
7272

7373
# Boost archive.
7474
#------------------------------------------------------------------------------
@@ -498,11 +498,14 @@ initialize_icu_packages()
498498
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
499499
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
500500
# renaming or important features, so we can't use that.
501-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
501+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
502+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
502503
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
503504

504-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
505-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
505+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
506+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
507+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
508+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
506509
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
507510
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
508511
fi
@@ -884,7 +887,7 @@ build_from_tarball_boost()
884887
# "-sICU_LINK=${ICU_LIBS[*]}"
885888

886889
./b2 install \
887-
"cxxstd=11" \
890+
"cxxstd=20" \
888891
"variant=release" \
889892
"threading=multi" \
890893
"$BOOST_TOOLSET" \

‎install-cmakepresets.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)
7373

7474
# ICU archive.
7575
#------------------------------------------------------------------------------
76-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
77-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
76+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
77+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
7878

7979
# Boost archive.
8080
#------------------------------------------------------------------------------
@@ -540,11 +540,14 @@ initialize_icu_packages()
540540
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
541541
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
542542
# renaming or important features, so we can't use that.
543-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
543+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
544+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
544545
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
545546

546-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
547-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
547+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
548+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
549+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
550+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
548551
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
549552
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
550553
fi
@@ -929,7 +932,7 @@ build_from_tarball_boost()
929932
# "-sICU_LINK=${ICU_LIBS[*]}"
930933

931934
./b2 install \
932-
"cxxstd=11" \
935+
"cxxstd=20" \
933936
"variant=release" \
934937
"threading=multi" \
935938
"$BOOST_TOOLSET" \

‎install.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)
6767

6868
# ICU archive.
6969
#------------------------------------------------------------------------------
70-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
71-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
70+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
71+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
7272

7373
# Boost archive.
7474
#------------------------------------------------------------------------------
@@ -441,11 +441,14 @@ initialize_icu_packages()
441441
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
442442
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
443443
# renaming or important features, so we can't use that.
444-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
444+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
445+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
445446
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
446447

447-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
448-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
448+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
449+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
450+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
451+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
449452
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
450453
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
451454
fi
@@ -759,7 +762,7 @@ build_from_tarball_boost()
759762
# "-sICU_LINK=${ICU_LIBS[*]}"
760763

761764
./b2 install \
762-
"cxxstd=11" \
765+
"cxxstd=20" \
763766
"variant=release" \
764767
"threading=multi" \
765768
"$BOOST_TOOLSET" \

0 commit comments

Comments
 (0)