Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions ports/icu/fix-using-install-sh.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/source/configure b/source/configure
index a6df219..2e1ebcf 100644
--- a/source/configure
+++ b/source/configure
@@ -4935,12 +4935,12 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'



-# make sure install is relative to srcdir - if a script
-if test "$srcdir" = "."; then
- # If srcdir isn't just ., then (srcdir) is already prepended.
- if test "${ac_install_sh}" = "${INSTALL}"; then
- INSTALL="\\\$(top_srcdir)/${ac_install_sh}"
- fi
+# If using the included install-sh, make INSTALL work from any build dir.
+if test "${ac_install_sh}" = "${INSTALL}"; then
+ case "$srcdir" in
+ .|./*|../*) INSTALL="\\\$(top_builddir)/${ac_install_sh}" ;;
+ *) ;;
+ esac
fi

# TODO(ICU-20301): Remove fallback to Python 2.
1 change: 1 addition & 0 deletions ports/icu/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
fix_bsd_and_solaris.patch
fix_parallel_build_on_windows.patch
fix-python-path-with-spaces.patch
fix-using-install-sh.diff
mh-darwin.patch
mh-mingw.patch
mh-msys-msvc.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/icu/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "icu",
"version": "78.3",
"port-version": 1,
"port-version": 2,
"description": "Mature and widely used Unicode and localization library.",
"homepage": "https://icu.unicode.org/home",
"license": "ICU",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3942,7 +3942,7 @@
},
"icu": {
"baseline": "78.3",
"port-version": 1
"port-version": 2
},
"ideep": {
"baseline": "2026-05-11",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/icu.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "da9f6dddd34300c1eea72aadde1d774ce2d3f31c",
"version": "78.3",
"port-version": 2
},
{
"git-tree": "931a42f3b3b911ba73dbbaead4c1e0037a158efd",
"version": "78.3",
Expand Down
Loading