external/icu/icu4c-build.patch

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