From ea4d62dca3e6a088823fc0f40b38179e269592a4 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Tue, 29 Mar 2022 08:38:21 +0300
Subject: [ICU] Add library name suffix for API rename to avoid conflicts.

---
 modules/text_server_adv/SCsub | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub
index dfd3bb3f1e..525d4d3efb 100644
--- a/modules/text_server_adv/SCsub
+++ b/modules/text_server_adv/SCsub
@@ -122,7 +122,7 @@ if env["builtin_harfbuzz"]:
     env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"])
     if env["builtin_icu"]:
         env_harfbuzz.Append(CPPPATH=["#thirdparty/icu4c/common/"])
-        env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU_BUILTIN"])
+        env_harfbuzz.Append(CCFLAGS=["-DU_HAVE_LIB_SUFFIX=1", "-DU_LIB_SUFFIX_C_NAME=_godot", "-DHAVE_ICU_BUILTIN"])
 
     if freetype_enabled:
         env_harfbuzz.Append(
@@ -464,11 +464,16 @@ if env["builtin_icu"]:
             "-DUCONFIG_NO_FILE_IO",
             "-DUCONFIG_NO_TRANSLITERATION",
             "-DPKGDATA_MODE=static",
+            "-DU_ENABLE_DYLOAD=0",
+            "-DU_HAVE_LIB_SUFFIX=1",
+            "-DU_LIB_SUFFIX_C_NAME=_godot",
             "-DICU_DATA_NAME=" + icu_data_name,
         ]
     )
     env_text_server_adv.Append(
         CXXFLAGS=[
+            "-DU_HAVE_LIB_SUFFIX=1",
+            "-DU_LIB_SUFFIX_C_NAME=_godot",
             "-DICU_DATA_NAME=" + icu_data_name,
         ]
     )
-- 
cgit v1.2.3