texlive[58047] Build/source/libs/icu: do not require

commits+karl at tug.org commits+karl at tug.org
Tue Mar 2 00:34:18 CET 2021


Revision: 58047
          http://tug.org/svn/texlive?view=revision&revision=58047
Author:   karl
Date:     2021-03-02 00:34:18 +0100 (Tue, 02 Mar 2021)
Log Message:
-----------
do not require TARGET_OS_SIMULATOR on darwin (from Mojca)

Modified Paths:
--------------
    trunk/Build/source/libs/icu/ChangeLog
    trunk/Build/source/libs/icu/TLpatches/ChangeLog
    trunk/Build/source/libs/icu/icu-src/source/common/putil.cpp

Added Paths:
-----------
    trunk/Build/source/libs/icu/TLpatches/patch-24-simulator

Modified: trunk/Build/source/libs/icu/ChangeLog
===================================================================
--- trunk/Build/source/libs/icu/ChangeLog	2021-03-01 23:01:38 UTC (rev 58046)
+++ trunk/Build/source/libs/icu/ChangeLog	2021-03-01 23:34:18 UTC (rev 58047)
@@ -1,3 +1,8 @@
+2021-03-01  Karl Berry  <karl at 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 at freefriends.org>
 
 	* Import icu-68.2, with new pain for max_align_t.

Modified: trunk/Build/source/libs/icu/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/icu/TLpatches/ChangeLog	2021-03-01 23:01:38 UTC (rev 58046)
+++ trunk/Build/source/libs/icu/TLpatches/ChangeLog	2021-03-01 23:34:18 UTC (rev 58047)
@@ -1,6 +1,12 @@
+2021-03-01  Mojca Miklavec  <mojca.miklavec.lists at 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 at 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
 

Added: trunk/Build/source/libs/icu/TLpatches/patch-24-simulator
===================================================================
--- trunk/Build/source/libs/icu/TLpatches/patch-24-simulator	                        (rev 0)
+++ trunk/Build/source/libs/icu/TLpatches/patch-24-simulator	2021-03-01 23:34:18 UTC (rev 58047)
@@ -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

Modified: trunk/Build/source/libs/icu/icu-src/source/common/putil.cpp
===================================================================
--- trunk/Build/source/libs/icu/icu-src/source/common/putil.cpp	2021-03-01 23:01:38 UTC (rev 58046)
+++ trunk/Build/source/libs/icu/icu-src/source/common/putil.cpp	2021-03-01 23:34:18 UTC (rev 58047)
@@ -1361,7 +1361,7 @@
 
 /* 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



More information about the tex-live-commits mailing list.