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 @@ -145,6 +145,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      {"sun",
  41          "\t.section \".rodata\"\n"
  42          "\t.align   8\n"
  43
  44 --- misc/icu/source/common/stringpiece.cpp      2010-09-29 20:37:20.000000000 +0200
  45 +++ misc/build/icu/source/common/stringpiece.cpp        2011-03-15 10:57:24.722045561 +0100
  46 @@ -75,7 +75,7 @@
  47   * Visual Studios 9.0.
  48   * Cygwin with MSVC 9.0 also complains here about redefinition.
  49   */
  50 -#if (!defined(_MSC_VER) || (_MSC_VER > 1500)) && !defined(CYGWINMSVC)
  51 +#if (!defined(_MSC_VER) && !defined(CYGWINMSVC))
  52  const int32_t StringPiece::npos;
  53  #endif
  54
  55 --- misc/icu/source/config/mh-darwin    2010-09-29 20:37:36.000000000 +0200
  56 +++ misc/build/icu/source/config/mh-darwin      2011-03-15 10:56:26.653056004 +0100
  57 @@ -25,11 +25,7 @@
  58  SHLIB.cc=      $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
  59
  60  ## Compiler switches to embed a library name and version information
  61 -ifeq ($(ENABLE_RPATH),YES)
  62 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
  63 -else
  64 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
  65 -endif
  66 +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(MIDDLE_SO_TARGET))
  67
  68  ## Compiler switch to embed a runtime search path
  69  LD_RPATH=
  70 @@ -45,10 +41,6 @@
  71  ## Non-shared intermediate object suffix
  72  STATIC_O = ao
  73
  74 -## Override Versioned target for a shared library.
  75 -FINAL_SO_TARGET=  $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
  76 -MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
  77 -
  78  ## Compilation rules
  79  %.$(STATIC_O): $(srcdir)/%.c
  80         $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
  81 @@ -80,16 +72,10 @@
  82
  83  ## Versioned libraries rules
  84
  85 -%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO)
  86 +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
  87         $(RM) $@ && ln -s ${<F} $@
  88 -%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
  89 -       $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
  90 -
  91 -# tzcode option
  92 -TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED
  93 -
  94 -# genren opts
  95 -GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt'
  96 +%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
  97 +       $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
  98
  99  ## Remove shared library 's'
 100  STATIC_PREFIX_WHEN_USED =
 101 --- misc/icu/source/layout/ArabicShaping.cpp    2010-09-29 20:38:38.000000000 +0200
 102 +++ misc/build/icu/source/layout/ArabicShaping.cpp      2011-03-15 10:56:26.655056238 +0100
 103 @@ -79,7 +79,6 @@
 104  #define markFeatureMask 0x00040000UL
 105  #define mkmkFeatureMask 0x00020000UL
 106
 107 -#define NO_FEATURES   0
 108  #define ISOL_FEATURES (isolFeatureMask | ligaFeatureMask | msetFeatureMask | markFeatureMask | ccmpFeatureMask | rligFeatureMask | caltFeatureMask | dligFeatureMask | cswhFeatureMask | cursFeatureMask | kernFeatureMask | mkmkFeatureMask)
 109
 110  #define SHAPE_MASK 0xF0000000UL
 111 @@ -174,11 +173,7 @@
 112          LEUnicode c = chars[in];
 113          ShapeType t = getShapeType(c);
 114
 115 -        if (t == ST_NOSHAPE_NONE) {
 116 -            glyphStorage.setAuxData(out, NO_FEATURES, success);
 117 -        } else {
 118              glyphStorage.setAuxData(out, ISOL_FEATURES, success);
 119 -        }
 120
 121          if ((t & MASK_TRANSPARENT) != 0) {
 122              continue;