Skip to content

Commit b74ec70

Browse files
pmienkpmienk
authored
Merge pull request #726 from pmienk/master
Update ICU to version 78.2 (installation, not minimum supported versi…
2 parents eaa1092 + 20797b9 commit b74ec70

4 files changed

Lines changed: 33 additions & 24 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 }}

‎install-cmake.sh‎

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

6565
# ICU archive.
6666
#------------------------------------------------------------------------------
67-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
68-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
67+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
68+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
6969

7070
# Boost archive.
7171
#------------------------------------------------------------------------------
@@ -495,11 +495,14 @@ initialize_icu_packages()
495495
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
496496
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
497497
# renaming or important features, so we can't use that.
498-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
498+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
499+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
499500
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
500501

501-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
502-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
502+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
503+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
504+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
505+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
503506
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
504507
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
505508
fi
@@ -881,7 +884,7 @@ build_from_tarball_boost()
881884
# "-sICU_LINK=${ICU_LIBS[*]}"
882885

883886
./b2 install \
884-
"cxxstd=11" \
887+
"cxxstd=20" \
885888
"variant=release" \
886889
"threading=multi" \
887890
"$BOOST_TOOLSET" \

‎install-cmakepresets.sh‎

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

7171
# ICU archive.
7272
#------------------------------------------------------------------------------
73-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
74-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
73+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
74+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
7575

7676
# Boost archive.
7777
#------------------------------------------------------------------------------
@@ -531,11 +531,14 @@ initialize_icu_packages()
531531
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
532532
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
533533
# renaming or important features, so we can't use that.
534-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
534+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
535+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
535536
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
536537

537-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
538-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
538+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
539+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
540+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
541+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
539542
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
540543
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
541544
fi
@@ -920,7 +923,7 @@ build_from_tarball_boost()
920923
# "-sICU_LINK=${ICU_LIBS[*]}"
921924

922925
./b2 install \
923-
"cxxstd=11" \
926+
"cxxstd=20" \
924927
"variant=release" \
925928
"threading=multi" \
926929
"$BOOST_TOOLSET" \

‎install.sh‎

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

6565
# ICU archive.
6666
#------------------------------------------------------------------------------
67-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
68-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
67+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
68+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
6969

7070
# Boost archive.
7171
#------------------------------------------------------------------------------
@@ -438,11 +438,14 @@ initialize_icu_packages()
438438
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
439439
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
440440
# renaming or important features, so we can't use that.
441-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
441+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
442+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
442443
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
443444

444-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
445-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
445+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
446+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
447+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
448+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
446449
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
447450
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
448451
fi
@@ -756,7 +759,7 @@ build_from_tarball_boost()
756759
# "-sICU_LINK=${ICU_LIBS[*]}"
757760

758761
./b2 install \
759-
"cxxstd=11" \
762+
"cxxstd=20" \
760763
"variant=release" \
761764
"threading=multi" \
762765
"$BOOST_TOOLSET" \

0 commit comments

Comments
 (0)