diff options
author | Karl Berry <karl@freefriends.org> | 2019-12-12 18:25:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-12-12 18:25:29 +0000 |
commit | 826971da3ef29f6034fc6a4786f88878a56c58e3 (patch) | |
tree | 023539b0120ff775316abf6a86f03c6f1f54b973 /Build/source/libs/icu/TLpatches | |
parent | 15a740f0c75d97855e67ba5bf83612e7b29a1319 (diff) |
icu-65.1, including linking upmendex with -lpthread if available
git-svn-id: svn://tug.org/texlive/trunk@53103 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/TLpatches')
-rw-r--r-- | Build/source/libs/icu/TLpatches/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/TL-Changes | 16 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-01-configure-gcc | 84 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-02-configure-solaris | 66 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-03-gcc-atomic | 17 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-12-mingw | 70 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX | 68 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-14-xopen | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-19-netbsd | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-20-private | 14 |
10 files changed, 126 insertions, 222 deletions
diff --git a/Build/source/libs/icu/TLpatches/ChangeLog b/Build/source/libs/icu/TLpatches/ChangeLog index c5ff53b84f7..6a1576401ae 100644 --- a/Build/source/libs/icu/TLpatches/ChangeLog +++ b/Build/source/libs/icu/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2019-12-12 Karl Berry <karl@freefriends.org> + + * Update for icu-65.1. + * patch-03-gcc-atomic: apparently no longer relevant. + 2019-02-10 Karl Berry <karl@tug.org> * patch-12-mingw: also patch numberrangeformatter.h diff --git a/Build/source/libs/icu/TLpatches/TL-Changes b/Build/source/libs/icu/TLpatches/TL-Changes index 88971ca2954..239bde3de62 100644 --- a/Build/source/libs/icu/TLpatches/TL-Changes +++ b/Build/source/libs/icu/TLpatches/TL-Changes @@ -1,6 +1,6 @@ Changes applied to the icu tree as obtained from: - http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz - and icu4c-63_1-data.zip + https://github.com/unicode-org/icu/releases/download/release-65-1/icu4c-65_1-src.tgz + and icu4c-65_1-data.zip cd $Build/source/libs/icu # for whatever $Build directory # update version.ac @@ -40,9 +40,10 @@ cp -p $aux/config.guess $aux/config.sub $aux/install-sh source # Assuming all seems ok, reduce size of source/data/in/icudt*.dat # to decrease data segment size, e.g., for old BSD. First, check # that we successfully built the full .dat: -srcdat=$Build/source/libs/icu/icu-src/source/data/in/icudt63l.dat -cd $Work/libs/icu/icu-build/data/out/build/icudt63l -indat=../../tmp/icudt63l.dat +ver=65 +srcdat=$Build/source/libs/icu/icu-src/source/data/in/icudt${ver}l.dat +cd $Work/libs/icu/icu-build/data/out/build/icudt${ver}l +indat=../../tmp/icudt${ver}l.dat diff $srcdat $indat # should be identical, amazingly enough. @@ -52,13 +53,14 @@ icupkg="env LD_LIBRARY_PATH=$gnu/lib ../../../../bin/icupkg" # then remove some elements unused by the icu clients in our tree, which are # bibtexu (in texk/bibtex-x), upmendex, and xetex (in texk/web2c/xetexdir). -outdat=icudt63l.dat +outdat=icudt${ver}l.dat $icupkg -r 'curr/*' $indat $outdat && \mv $outdat $indat $icupkg -r 'lang/*' $indat $outdat && \mv $outdat $indat $icupkg -r 'region/*' $indat $outdat && \mv $outdat $indat $icupkg -r 'rfc*.spp' $indat $outdat && \mv $outdat $indat $icupkg -r 'zone/*' $indat $outdat && \mv $outdat $indat -ls -l $indat $srcdat # indat should be much smaller +ls -l $indat $srcdat # indat should be smaller cp $indat $srcdat +# update icu/ChangeLog and icu/TLpatches/ChangeLog. # then commit. diff --git a/Build/source/libs/icu/TLpatches/patch-01-configure-gcc b/Build/source/libs/icu/TLpatches/patch-01-configure-gcc index b13580eee40..4a7a8b9b667 100644 --- a/Build/source/libs/icu/TLpatches/patch-01-configure-gcc +++ b/Build/source/libs/icu/TLpatches/patch-01-configure-gcc @@ -1,57 +1,33 @@ For TL, we do not want to prefer clang(++) for ICU when the whole rest of the tree prefers gcc. -*** source/configure Tue Jan 8 10:13:37 2019 ---- source/configure~ Mon Oct 1 15:39:56 2018 -*************** -*** 2861,2865 **** - ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then -! for ac_prog in gcc cc clang c99 c89 xlc_r xlc cl.exe icc - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ---- 2861,2865 ---- - ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then -! for ac_prog in clang gcc cc c99 c89 xlc_r xlc cl.exe icc - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -*************** -*** 2905,2909 **** - if test -z "$CC"; then - ac_ct_CC=$CC -! for ac_prog in gcc cc clang c99 c89 xlc_r xlc cl.exe icc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. ---- 2905,2909 ---- - if test -z "$CC"; then - ac_ct_CC=$CC -! for ac_prog in clang gcc cc c99 c89 xlc_r xlc cl.exe icc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -*************** -*** 3464,3468 **** - else - if test -n "$ac_tool_prefix"; then -! for ac_prog in g++ c++ clang++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ---- 3464,3468 ---- - else - if test -n "$ac_tool_prefix"; then -! for ac_prog in clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -*************** -*** 3508,3512 **** - if test -z "$CXX"; then - ac_ct_CXX=$CXX -! for ac_prog in g++ c++ clang++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. ---- 3508,3512 ---- - if test -z "$CXX"; then - ac_ct_CXX=$CXX -! for ac_prog in clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. +--- source/configure~ 2019-10-03 04:16:41.000000000 -0700 ++++ source/configure 2019-12-11 15:28:59.429357803 -0800 +@@ -2911,5 +2911,5 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in clang gcc cc c99 c89 xlc_r xlc cl.exe icc ++ for ac_prog in gcc cc clang c99 c89 xlc_r xlc cl.exe icc + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +@@ -2955,5 +2955,5 @@ + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in clang gcc cc c99 c89 xlc_r xlc cl.exe icc ++ for ac_prog in gcc cc clang c99 c89 xlc_r xlc cl.exe icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -3514,5 +3514,5 @@ + else + if test -n "$ac_tool_prefix"; then +- for ac_prog in clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC ++ for ac_prog in g++ c++ clang++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +@@ -3558,5 +3558,5 @@ + if test -z "$CXX"; then + ac_ct_CXX=$CXX +- for ac_prog in clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC ++ for ac_prog in g++ c++ clang++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC + do + # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris index 1aeda2cba22..8d76a8bc66e 100644 --- a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris +++ b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris @@ -1,50 +1,20 @@ Do not disable C++11 on Solaris, since we don't use the Sun compiler. -*** source/configure.ORIG1 Mon Jan 7 11:18:59 2019 ---- source/configure Mon Jan 7 11:27:11 2019 -*************** -*** 6095,6103 **** - CXXFLAGS="$OLD_CXXFLAGS" - fi -! case "${host}" in -! *-*-solaris*) -! CXXFLAGS="$OLD_CXXFLAGS" -! ;; -! esac - fi - fi ---- 6095,6104 ---- - CXXFLAGS="$OLD_CXXFLAGS" - fi -! # TL: why? http://bugs.icu-project.org/trac/ticket/13543 -! # case "${host}" in -! # *-*-solaris*) -! # CXXFLAGS="$OLD_CXXFLAGS" -! # ;; -! # esac - fi - fi -*** source/configure.ac.ORIG1 Mon Jan 7 11:18:59 2019 ---- source/configure.ac Mon Jan 7 11:28:00 2019 -*************** -*** 522,530 **** - CXXFLAGS="$OLD_CXXFLAGS" - fi -! case "${host}" in -! *-*-solaris*) -! CXXFLAGS="$OLD_CXXFLAGS" -! ;; -! esac - fi - fi ---- 522,531 ---- - CXXFLAGS="$OLD_CXXFLAGS" - fi -! # TL: why? http://bugs.icu-project.org/trac/ticket/13543 -! # case "${host}" in -! # *-*-solaris*) -! # CXXFLAGS="$OLD_CXXFLAGS" -! # ;; -! # esac - fi - fi +--- source/configure~ 2019-12-11 15:28:59.429357803 -0800 ++++ source/configure 2019-12-11 15:30:37.229105055 -0800 +@@ -6147,9 +6147,10 @@ + CXXFLAGS="$OLD_CXXFLAGS" + fi +- case "${host}" in +- *-*-solaris*) +- CXXFLAGS="$OLD_CXXFLAGS" +- ;; +- esac ++# TL: why? http://bugs.icu-project.org/trac/ticket/13543 ++# case "${host}" in ++# *-*-solaris*) ++# CXXFLAGS="$OLD_CXXFLAGS" ++# ;; ++# esac + fi + fi diff --git a/Build/source/libs/icu/TLpatches/patch-03-gcc-atomic b/Build/source/libs/icu/TLpatches/patch-03-gcc-atomic deleted file mode 100644 index 333f57d785d..00000000000 --- a/Build/source/libs/icu/TLpatches/patch-03-gcc-atomic +++ /dev/null @@ -1,17 +0,0 @@ - It seems gcc-4.4 uses external calls. - -*** source/common/putilimp.h~ Mon Oct 1 15:39:56 2018 ---- source/common/putilimp.h Tue Jan 8 10:15:13 2019 -*************** -*** 191,195 **** - #elif U_PLATFORM == U_PF_MINGW - #define U_HAVE_GCC_ATOMICS 0 -! #elif U_GCC_MAJOR_MINOR >= 404 || defined(__clang__) - /* TODO: Intel icc and IBM xlc on AIX also support gcc atomics. (Intel originated them.) - * Add them for these compilers. ---- 191,195 ---- - #elif U_PLATFORM == U_PF_MINGW - #define U_HAVE_GCC_ATOMICS 0 -! #elif U_GCC_MAJOR_MINOR >= 405 || defined(__clang__) - /* TODO: Intel icc and IBM xlc on AIX also support gcc atomics. (Intel originated them.) - * Add them for these compilers. diff --git a/Build/source/libs/icu/TLpatches/patch-12-mingw b/Build/source/libs/icu/TLpatches/patch-12-mingw index ee175be6951..7b4ff04f429 100644 --- a/Build/source/libs/icu/TLpatches/patch-12-mingw +++ b/Build/source/libs/icu/TLpatches/patch-12-mingw @@ -1,44 +1,30 @@ We don't want this for TeX Live cross compilation. -*** source/config/mh-mingw~ Mon Oct 1 15:39:56 2018 ---- source/config/mh-mingw Tue Jan 8 10:16:08 2019 -*************** -*** 71,95 **** - STATIC_O = ao - -- ifeq ($(ENABLE_SHARED),YES) -- SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR) -- else -- SO_TARGET_VERSION_SUFFIX = -- endif -- -- # Static library prefix and file extension -- LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) -- A = a -- - ## An import library is needed for z/OS and MSVC - IMPORT_LIB_EXT = .dll.a - -- LIBPREFIX=lib -- -- # Change the stubnames so that poorly working FAT disks and installation programs can work. -- # This is also for backwards compatibility. -- DATA_STUBNAME = dt -- I18N_STUBNAME = in -- LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) -- - #SH### copied from Makefile.inc - #SH## for icu-config to test with ---- 71,77 ---- - ---- source/i18n/unicode/numberrangeformatter.h (revision 49992) -+++ source/i18n/unicode/numberrangeformatter.h (working copy) -@@ -185,7 +185,7 @@ - * Export an explicit template instantiation. See datefmt.h - * (When building DLLs for Windows this is required.) - */ --#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN) -+#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM < U_PF_MINGW && !defined(U_IN_DOXYGEN) && defined(X) - template struct U_I18N_API std::atomic<impl::NumberRangeFormatterImpl*>; - #endif - /** \endcond */ +--- source/config/mh-mingw~ 2019-10-03 04:16:41.000000000 -0700 ++++ source/config/mh-mingw 2019-12-11 15:34:02.831473103 -0800 +@@ -71,25 +71,7 @@ + STATIC_O = ao + +-ifeq ($(ENABLE_SHARED),YES) +-SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR) +-else +-SO_TARGET_VERSION_SUFFIX = +-endif +- +-# Static library prefix and file extension +-LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) +-A = a +- + ## An import library is needed for z/OS and MSVC + IMPORT_LIB_EXT = .dll.a + +-LIBPREFIX=lib +- +-# Change the stubnames so that poorly working FAT disks and installation programs can work. +-# This is also for backwards compatibility. +-DATA_STUBNAME = dt +-I18N_STUBNAME = in +-LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) +- + #SH### copied from Makefile.inc + #SH## for icu-config to test with diff --git a/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX b/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX index 0330c084ec4..97031f24d3c 100644 --- a/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX +++ b/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX @@ -1,45 +1,27 @@ No `s' for STATIC_PREFIX. -*** source/config/Makefile.inc.in~ Fri Sep 28 17:34:41 2018 ---- source/config/Makefile.inc.in Tue Jan 8 10:17:00 2019 -*************** -*** 47,51 **** - - # Static library prefix and file extension -! STATIC_PREFIX = s - LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX) - A = a ---- 47,51 ---- - - # Static library prefix and file extension -! STATIC_PREFIX = - LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX) - A = a -*** source/icudefs.mk.in~ Fri Sep 28 17:34:42 2018 ---- source/icudefs.mk.in Tue Jan 8 10:17:00 2019 -*************** -*** 211,215 **** - ## If we can't use the shared libraries, use the static libraries - ifneq ($(ENABLE_SHARED),YES) -! STATIC_PREFIX_WHEN_USED = s - else - STATIC_PREFIX_WHEN_USED = ---- 211,215 ---- - ## If we can't use the shared libraries, use the static libraries - ifneq ($(ENABLE_SHARED),YES) -! STATIC_PREFIX_WHEN_USED = - else - STATIC_PREFIX_WHEN_USED = -*************** -*** 217,221 **** - - # Static library prefix and file extension -! STATIC_PREFIX = s - LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) - A = a ---- 217,221 ---- - - # Static library prefix and file extension -! STATIC_PREFIX = - LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) - A = a +--- source/config/Makefile.inc.in~ 2019-10-03 04:16:41.000000000 -0700 ++++ source/config/Makefile.inc.in 2019-12-11 15:36:12.724809309 -0800 +@@ -47,5 +47,5 @@ + + # Static library prefix and file extension +-STATIC_PREFIX = s ++STATIC_PREFIX = + LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX) + A = a +--- source/icudefs.mk.in~ 2019-10-03 04:16:41.000000000 -0700 ++++ source/icudefs.mk.in 2019-12-11 15:36:12.725809296 -0800 +@@ -214,5 +214,5 @@ + ## If we can't use the shared libraries, use the static libraries + ifneq ($(ENABLE_SHARED),YES) +-STATIC_PREFIX_WHEN_USED = s ++STATIC_PREFIX_WHEN_USED = + else + STATIC_PREFIX_WHEN_USED = +@@ -220,5 +220,5 @@ + + # Static library prefix and file extension +-STATIC_PREFIX = s ++STATIC_PREFIX = + LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a diff --git a/Build/source/libs/icu/TLpatches/patch-14-xopen b/Build/source/libs/icu/TLpatches/patch-14-xopen index 45a85eb0b97..704f8cea520 100644 --- a/Build/source/libs/icu/TLpatches/patch-14-xopen +++ b/Build/source/libs/icu/TLpatches/patch-14-xopen @@ -1,8 +1,8 @@ Do not define _XOPEN_SOURCE_EXTENDED on Solaris, notwithstanding comments in icu source. ---- source/common/uposixdefs.h.ORIG 2018-03-26 06:38:30.000000000 -0700 -+++ source/common/uposixdefs.h 2018-03-28 15:39:29.245884244 -0700 +--- source/common/uposixdefs.h~ 2019-10-03 04:16:41.000000000 -0700 ++++ source/common/uposixdefs.h 2019-12-11 15:37:42.741655847 -0800 @@ -52,8 +52,11 @@ * Poorly upgraded Solaris machines can't have this defined. * Cleanly installed Solaris can use this #define. diff --git a/Build/source/libs/icu/TLpatches/patch-19-netbsd b/Build/source/libs/icu/TLpatches/patch-19-netbsd index 23c5a31f0ae..8bae72a5494 100644 --- a/Build/source/libs/icu/TLpatches/patch-19-netbsd +++ b/Build/source/libs/icu/TLpatches/patch-19-netbsd @@ -2,8 +2,8 @@ From: Marc Baudoin <babafou@babafou.eu.org> tlbuild ---- source/common/uposixdefs.h.ORIG1 2018-03-28 15:39:29.245884244 -0700 -+++ source/common/uposixdefs.h 2018-03-28 15:40:40.027978901 -0700 +--- source/common/uposixdefs.h~ 2019-12-11 15:37:42.741655847 -0800 ++++ source/common/uposixdefs.h 2019-12-11 15:38:16.991216886 -0800 @@ -72,3 +72,7 @@ #endif diff --git a/Build/source/libs/icu/TLpatches/patch-20-private b/Build/source/libs/icu/TLpatches/patch-20-private index 3991494affe..5cea1c18349 100644 --- a/Build/source/libs/icu/TLpatches/patch-20-private +++ b/Build/source/libs/icu/TLpatches/patch-20-private @@ -5,8 +5,8 @@ http://tug.org/pipermail/tlbuild/2016q1/003438.html (and starting at http://tug.org/pipermail/tlbuild/2016q1/003433.html) ---- source/i18n/dayperiodrules.h.ORIG 2018-03-26 06:38:30.000000000 -0700 -+++ source/i18n/dayperiodrules.h 2018-03-28 15:41:21.288451156 -0700 +--- source/i18n/dayperiodrules.h~ 2019-10-03 04:16:41.000000000 -0700 ++++ source/i18n/dayperiodrules.h 2019-12-11 15:38:52.103766812 -0800 @@ -56,5 +56,5 @@ double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const; @@ -14,16 +14,16 @@ +/* nothing private to placate old compilers --karl/koch private: */ DayPeriodRules(); ---- source/i18n/unicode/dtitvinf.h.ORIG 2018-03-26 06:38:30.000000000 -0700 -+++ source/i18n/unicode/dtitvinf.h 2018-03-28 15:41:21.288451156 -0700 -@@ -329,5 +329,5 @@ +--- source/i18n/unicode/dtitvinf.h~ 2019-10-03 04:16:41.000000000 -0700 ++++ source/i18n/unicode/dtitvinf.h 2019-12-11 15:38:52.103766812 -0800 +@@ -330,5 +330,5 @@ -private: +/* nothing private to placate old compilers --karl/koch private: */ /** * DateIntervalFormat will need access to -@@ -363,5 +363,6 @@ +@@ -364,5 +364,6 @@ }; public: -#ifndef U_HIDE_INTERNAL_API @@ -31,7 +31,7 @@ +/* ifndef U_HIDE_INTERNAL_API */ /** * Max index for stored interval patterns -@@ -371,6 +372,6 @@ +@@ -372,6 +373,6 @@ kMaxIntervalPatternIndex = kIPI_MAX_INDEX }; -#endif /* U_HIDE_INTERNAL_API */ |