From 20562c3954a288cbbe4bf420325732e093a222a8 Mon Sep 17 00:00:00 2001 From: Woongsuk Cho Date: Thu, 8 Dec 2022 17:33:34 +0900 Subject: [PATCH] [Tizen] Select ICU build time version Backport : https://github.com/dotnet/runtime/pull/79259/ --- .../Unix/System.Globalization.Native/pal_icushim.c | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c index 4f71b66..0b02898 100644 --- a/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c +++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c @@ -282,18 +282,28 @@ static int FindLibUsingOverride(const char* versionPrefix, char* symbolName, cha char* versionOverride = getenv("CLR_ICU_VERSION_OVERRIDE"); if (versionOverride != NULL) { - int first = -1; - int second = -1; - int third = -1; - - int matches = sscanf(versionOverride, "%d.%d.%d", &first, &second, &third); - if (matches > 0) + if (strcmp(versionOverride, "build") == 0) { - if (OpenICULibraries(first, second, third, versionPrefix, symbolName, symbolVersion)) + if (OpenICULibraries(U_ICU_VERSION_MAJOR_NUM, -1, -1, versionPrefix, symbolName, symbolVersion)) { return true; } } + else + { + int first = -1; + int second = -1; + int third = -1; + + int matches = sscanf(versionOverride, "%d.%d.%d", &first, &second, &third); + if (matches > 0) + { + if (OpenICULibraries(first, second, third, versionPrefix, symbolName, symbolVersion)) + { + return true; + } + } + } } return false; -- 2.7.4