From ea49d3d866c3354be45fb196d6ccc505e2c98304 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 1 Mar 2021 23:34:18 +0000 Subject: do not require TARGET_OS_SIMULATOR on darwin (from Mojca) git-svn-id: svn://tug.org/texlive/trunk@58047 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/icu/ChangeLog | 5 +++++ Build/source/libs/icu/TLpatches/ChangeLog | 8 +++++++- Build/source/libs/icu/TLpatches/patch-24-simulator | 13 +++++++++++++ Build/source/libs/icu/icu-src/source/common/putil.cpp | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 Build/source/libs/icu/TLpatches/patch-24-simulator (limited to 'Build/source') 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 + + * icu-src/source/common/putil.cpp [DARWIN]: don't require + TARGET_OS_SIMULATOR: TLpatches/patch-24-simulator. + 2021-02-13 Karl Berry * 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 + + * 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 - * 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 -- cgit v1.2.3