external/icu/icu4c-build.patch.1

   1 diff -ur icu.org/source/config/mh-darwin icu/source/config/mh-darwin
   2 --- icu.org/source/config/mh-darwin     2016-06-15 20:58:17.000000000 +0200
   3 +++ icu/source/config/mh-darwin 2017-04-21 21:30:23.584568210 +0200
   4 @@ -30,11 +30,7 @@
   5  SHLIB.cc=      $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
   6
   7  ## Compiler switches to embed a library name and version information
   8 -ifeq ($(ENABLE_RPATH),YES)
   9 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
  10 -else
  11 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
  12 -endif
  13 +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @__________________________________________________URELIB/$(notdir $(MIDDLE_SO_TARGET))
  14
  15  ## Compiler switch to embed a runtime search path
  16  LD_RPATH=
  17 @@ -50,10 +46,6 @@
  18  ## Non-shared intermediate object suffix
  19  STATIC_O = ao
  20
  21 -## Override Versioned target for a shared library.
  22 -FINAL_SO_TARGET=  $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
  23 -MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
  24 -
  25  ## Compilation and dependency rules
  26  %.$(STATIC_O): $(srcdir)/%.c
  27         $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
  28 @@ -67,16 +59,10 @@
  29
  30  ## Versioned libraries rules
  31
  32 -%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO)
  33 +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
  34         $(RM) $@ && ln -s ${<F} $@
  35 -%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
  36 -       $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
  37 -
  38 -# tzcode option
  39 -TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED
  40 -
  41 -# genren opts
  42 -GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt'
  43 +%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
  44 +       $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
  45
  46  ## Remove shared library 's'
  47  STATIC_PREFIX_WHEN_USED =
  48 diff -ur icu.org/source/tools/toolutil/pkg_genc.cpp icu/source/tools/toolutil/pkg_genc.cpp
  49 --- icu.org/source/tools/toolutil/pkg_genc.cpp  2017-04-13 11:46:02.000000000 +0200
  50 +++ icu/source/tools/toolutil/pkg_genc.cpp      2017-04-21 21:30:23.583568212 +0200
  51 @@ -160,6 +160,28 @@
  52
  53          ".long ","",HEX_0X
  54      },
  55 +    {"gcc-android-arm",
  56 +        "\t.arch armv5te\n"
  57 +        "\t.fpu softvfp\n"
  58 +        "\t.eabi_attribute 20, 1\n"
  59 +        "\t.eabi_attribute 21, 1\n"
  60 +        "\t.eabi_attribute 23, 3\n"
  61 +        "\t.eabi_attribute 24, 1\n"
  62 +        "\t.eabi_attribute 25, 1\n"
  63 +        "\t.eabi_attribute 26, 2\n"
  64 +        "\t.eabi_attribute 30, 6\n"
  65 +        "\t.eabi_attribute 18, 4\n"
  66 +        "\t.file \"%s.s\"\n"
  67 +        "\t.global %s\n"
  68 +        "\t.section .rodata\n"
  69 +        "\t.align 2\n"
  70 +        "\t.type %s, %%object\n"
  71 +        "%s:\n",
  72 +
  73 +        "\t.word ",
  74 +        "\t.section .note.GNU-stack,\"\",%%progbits\n",
  75 +        HEX_0X
  76 +    },
  77  /* 16 bytes alignment. */
  78  /* http://docs.oracle.com/cd/E19641-01/802-1947/802-1947.pdf */
  79      {"sun",
  80 diff -ur icu.org/source/tools/toolutil/pkg_genc.h icu/source/tools/toolutil/pkg_genc.h
  81 --- icu.org/source/tools/toolutil/pkg_genc.h    2017-01-20 01:20:31.000000000 +0100
  82 +++ icu/source/tools/toolutil/pkg_genc.h        2017-04-21 21:30:23.582568215 +0200
  83 @@ -60,7 +60,7 @@
  84  #endif
  85
  86  #define LARGE_BUFFER_MAX_SIZE 2048
  87 -#define SMALL_BUFFER_MAX_SIZE 512
  88 +#define SMALL_BUFFER_MAX_SIZE 2048
  89  #define SMALL_BUFFER_FLAG_NAMES 32
  90  #define BUFFER_PADDING_SIZE 20
  91