Skip to content

Commit c39e467

Browse files
pmienkpmienk
authored
Merge pull request #975 from pmienk/master
Update ICU to version 78.2 (installation, not minimum supported versi…
2 parents c7a5309 + 15a0ff3 commit c39e467

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

‎.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
@@ -66,8 +66,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)
6666

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

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

503-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
504-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
504+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
505+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
506+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
507+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
505508
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
506509
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
507510
fi
@@ -883,7 +886,7 @@ build_from_tarball_boost()
883886
# "-sICU_LINK=${ICU_LIBS[*]}"
884887

885888
./b2 install \
886-
"cxxstd=11" \
889+
"cxxstd=20" \
887890
"variant=release" \
888891
"threading=multi" \
889892
"$BOOST_TOOLSET" \

‎install-cmakepresets.sh‎

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

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

7878
# Boost archive.
7979
#------------------------------------------------------------------------------
@@ -537,11 +537,14 @@ initialize_icu_packages()
537537
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
538538
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
539539
# renaming or important features, so we can't use that.
540-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
540+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
541+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
541542
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
542543

543-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
544-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
544+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
545+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
546+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
547+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
545548
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
546549
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
547550
fi
@@ -926,7 +929,7 @@ build_from_tarball_boost()
926929
# "-sICU_LINK=${ICU_LIBS[*]}"
927930

928931
./b2 install \
929-
"cxxstd=11" \
932+
"cxxstd=20" \
930933
"variant=release" \
931934
"threading=multi" \
932935
"$BOOST_TOOLSET" \

‎install.sh‎

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

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

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

446-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
447-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
447+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
448+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
449+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
450+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
448451
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
449452
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
450453
fi
@@ -758,7 +761,7 @@ build_from_tarball_boost()
758761
# "-sICU_LINK=${ICU_LIBS[*]}"
759762

760763
./b2 install \
761-
"cxxstd=11" \
764+
"cxxstd=20" \
762765
"variant=release" \
763766
"threading=multi" \
764767
"$BOOST_TOOLSET" \

0 commit comments

Comments
 (0)