Skip to content

Update ICU to version 78.2 (installation, not minimum supported versi… #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pmienk wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −31
Open

Update ICU to version 78.2 (installation, not minimum supported versi… #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
coverage: "nocov"
detectcpuflags: "ignore"
boost: "--build-boost"
icu: ""
icu: "--with-icu"
llvm: ""
secp256k1: "--build-secp256k1"
cc: "clang"
Expand All @@ -110,14 +110,14 @@ jobs:
coverage: "nocov"
detectcpuflags: "ignore"
boost: "--build-boost"
icu: ""
icu: "--build-icu --with-icu"
llvm: ""
secp256k1: "--build-secp256k1"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE"
options: "--enable-isystem"
packager: "brew"
packages: "icu4c"
packages: ""


runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -364,7 +364,7 @@ jobs:
coverage: "nocov"
detectcpuflags: "ignore"
boost: "--build-boost"
icu: ""
icu: "--with-icu"
llvm: ""
secp256k1: "--build-secp256k1"
cc: "clang"
Expand All @@ -381,14 +381,14 @@ jobs:
coverage: "nocov"
detectcpuflags: "ignore"
boost: "--build-boost"
icu: ""
icu: "--build-icu --with-icu"
llvm: ""
secp256k1: "--build-secp256k1"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE"
options: ""
packager: "brew"
packages: "icu4c"
packages: ""


runs-on: ${{ matrix.os }}
Expand Down
8 changes: 4 additions & 4 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@ if (with-tests)
"../../test/test.cpp"
"../../test/test.hpp"
"../../test/endpoints/README.md"
"../../test/endpoints/bitcoind_rpc.py"
"../../test/endpoints/configuration.py"
"../../test/endpoints/electrum.py"
"../../test/endpoints/native.py"
"../../test/endpoints/conftest.py"
"../../test/endpoints/test_bitcoind_rpc.py"
"../../test/endpoints/test_electrum.py"
"../../test/endpoints/test_native.py"
"../../test/endpoints/utils.py"
"../../test/parsers/bitcoind_query.cpp"
"../../test/parsers/bitcoind_target.cpp"
Expand Down
4 changes: 1 addition & 3 deletions builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,7 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\test\configuration.cpp">
<ObjectFileName>$(IntDir)test_configuration.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\configuration.cpp" />
<ClCompile Include="..\..\..\..\test\error.cpp" />
<ClCompile Include="..\..\..\..\test\estimator.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
Expand Down
15 changes: 9 additions & 6 deletions install-cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)

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

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

if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
fi
Expand Down Expand Up @@ -884,7 +887,7 @@ build_from_tarball_boost()
# "-sICU_LINK=${ICU_LIBS[*]}"

./b2 install \
"cxxstd=11" \
"cxxstd=20" \
"variant=release" \
"threading=multi" \
"$BOOST_TOOLSET" \
Expand Down
15 changes: 9 additions & 6 deletions install-cmakepresets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)

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

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

if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
fi
Expand Down Expand Up @@ -929,7 +932,7 @@ build_from_tarball_boost()
# "-sICU_LINK=${ICU_LIBS[*]}"

./b2 install \
"cxxstd=11" \
"cxxstd=20" \
"variant=release" \
"threading=multi" \
"$BOOST_TOOLSET" \
Expand Down
15 changes: 9 additions & 6 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)

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

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

if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
fi
Expand Down Expand Up @@ -759,7 +762,7 @@ build_from_tarball_boost()
# "-sICU_LINK=${ICU_LIBS[*]}"

./b2 install \
"cxxstd=11" \
"cxxstd=20" \
"variant=release" \
"threading=multi" \
"$BOOST_TOOLSET" \
Expand Down
Loading