summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-01 23:34:18 +0000
committerKarl Berry <karl@freefriends.org>2021-03-01 23:34:18 +0000
commitea49d3d866c3354be45fb196d6ccc505e2c98304 (patch)
treedc6f398143afb788ea1f7f481901b6a1ac1ff292 /Build
parentabe03c2f70670d603c76b183b8141079c62689c0 (diff)
do not require TARGET_OS_SIMULATOR on darwin (from Mojca)
git-svn-id: svn://tug.org/texlive/trunk@58047 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/icu/ChangeLog5
-rw-r--r--Build/source/libs/icu/TLpatches/ChangeLog8
-rw-r--r--Build/source/libs/icu/TLpatches/patch-24-simulator13
-rw-r--r--Build/source/libs/icu/icu-src/source/common/putil.cpp2
4 files changed, 26 insertions, 2 deletions
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index d18eed3eff1..bad40c03307 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-01 Karl Berry <karl@freefriends.org>
+
+ * icu-src/source/common/putil.cpp [DARWIN]: don't require
+ TARGET_OS_SIMULATOR: TLpatches/patch-24-simulator.
+
2021-02-13 Karl Berry <karl@freefriends.org>
* Import icu-68.2, with new pain for max_align_t.
diff --git a/Build/source/libs/icu/TLpatches/ChangeLog b/Build/source/libs/icu/TLpatches/ChangeLog
index dfffb6cd22f..65f6ed5f9b7 100644
--- a/Build/source/libs/icu/TLpatches/ChangeLog
+++ b/Build/source/libs/icu/TLpatches/ChangeLog
@@ -1,6 +1,12 @@
+2021-03-01 Mojca Miklavec <mojca.miklavec.lists@gmail.com>
+
+ * patch-24-simulator: new patch.
+ https://github.com/unicode-org/icu/pull/1608
+ https://unicode-org.atlassian.net/browse/ICU-21513
+
2020-01-13 Karl Berry <karl@freefriends.org>
- * patch-04-data-makefile: new Makefilepatch needed on Solaris
+ * patch-04-data-makefile: new Makefile patch needed on Solaris
found by Mojca, from:
https://unicode-org.atlassian.net/browse/ICU-20852
diff --git a/Build/source/libs/icu/TLpatches/patch-24-simulator b/Build/source/libs/icu/TLpatches/patch-24-simulator
new file mode 100644
index 00000000000..accc7d749c3
--- /dev/null
+++ b/Build/source/libs/icu/TLpatches/patch-24-simulator
@@ -0,0 +1,13 @@
+Index: putil.cpp
+===================================================================
+--- putil.cpp (revision 58009)
++++ putil.cpp (working copy)
+@@ -1361,7 +1361,7 @@ uprv_pathIsAbsolute(const char *path)
+
+ /* Backup setting of ICU_DATA_DIR_PREFIX_ENV_VAR
+ (needed for some Darwin ICU build environments) */
+-#if U_PLATFORM_IS_DARWIN_BASED && TARGET_OS_SIMULATOR
++#if U_PLATFORM_IS_DARWIN_BASED && defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
+ # if !defined(ICU_DATA_DIR_PREFIX_ENV_VAR)
+ # define ICU_DATA_DIR_PREFIX_ENV_VAR "IPHONE_SIMULATOR_ROOT"
+ # endif
diff --git a/Build/source/libs/icu/icu-src/source/common/putil.cpp b/Build/source/libs/icu/icu-src/source/common/putil.cpp
index 3ed6a05d22d..e2681ca0051 100644
--- a/Build/source/libs/icu/icu-src/source/common/putil.cpp
+++ b/Build/source/libs/icu/icu-src/source/common/putil.cpp
@@ -1361,7 +1361,7 @@ uprv_pathIsAbsolute(const char *path)
/* Backup setting of ICU_DATA_DIR_PREFIX_ENV_VAR
(needed for some Darwin ICU build environments) */
-#if U_PLATFORM_IS_DARWIN_BASED && TARGET_OS_SIMULATOR
+#if U_PLATFORM_IS_DARWIN_BASED && defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
# if !defined(ICU_DATA_DIR_PREFIX_ENV_VAR)
# define ICU_DATA_DIR_PREFIX_ENV_VAR "IPHONE_SIMULATOR_ROOT"
# endif