From 20797b903cf5344e16cdcf574618cc0943c5c916 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Sat, 28 Feb 2026 01:45:57 -0800 Subject: [PATCH] Update ICU to version 78.2 (installation, not minimum supported version). --- .github/workflows/ci.yml | 12 ++++++------ install-cmake.sh | 15 +++++++++------ install-cmakepresets.sh | 15 +++++++++------ install.sh | 15 +++++++++------ 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 574e323f..2cd8b67a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: coverage: "nocov" detectcpuflags: "ignore" boost: "--build-boost" - icu: "" + icu: "--with-icu" llvm: "" secp256k1: "--build-secp256k1" cc: "clang" @@ -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 }} @@ -364,7 +364,7 @@ jobs: coverage: "nocov" detectcpuflags: "ignore" boost: "--build-boost" - icu: "" + icu: "--with-icu" llvm: "" secp256k1: "--build-secp256k1" cc: "clang" @@ -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 }} diff --git a/install-cmake.sh b/install-cmake.sh index db967e37..c3be719b 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -64,8 +64,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. #------------------------------------------------------------------------------ @@ -495,11 +495,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 @@ -881,7 +884,7 @@ build_from_tarball_boost() # "-sICU_LINK=${ICU_LIBS[*]}" ./b2 install \ - "cxxstd=11" \ + "cxxstd=20" \ "variant=release" \ "threading=multi" \ "$BOOST_TOOLSET" \ diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index c229fdca..26077a24 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -70,8 +70,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. #------------------------------------------------------------------------------ @@ -531,11 +531,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 @@ -920,7 +923,7 @@ build_from_tarball_boost() # "-sICU_LINK=${ICU_LIBS[*]}" ./b2 install \ - "cxxstd=11" \ + "cxxstd=20" \ "variant=release" \ "threading=multi" \ "$BOOST_TOOLSET" \ diff --git a/install.sh b/install.sh index 0cc5643e..257e3c34 100755 --- a/install.sh +++ b/install.sh @@ -64,8 +64,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. #------------------------------------------------------------------------------ @@ -438,11 +438,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 @@ -756,7 +759,7 @@ build_from_tarball_boost() # "-sICU_LINK=${ICU_LIBS[*]}" ./b2 install \ - "cxxstd=11" \ + "cxxstd=20" \ "variant=release" \ "threading=multi" \ "$BOOST_TOOLSET" \