external/icu/icu4c-android.patch

   1 --- misc/icu/source/config/mh-linux     2013-10-05 03:50:00.000000000 +0700
   2 +++ misc/build/icu/source/config/mh-linux       2013-11-10 17:11:46.856222557 +0700
   3 @@ -25,7 +25,7 @@
   4
   5  ## Compiler switch to embed a library name
   6  # The initial tab in the next line is to prevent icu-config from reading it.
   7 -       LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
   8 +       #LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
   9  #SH# # We can't depend on MIDDLE_SO_TARGET being set.
  10  #SH# LD_SONAME=
  11
  12 --- misc/icu/source/configure   2013-10-05 03:54:58.000000000 +0700
  13 +++ misc/build/icu/source/configure     2013-11-10 17:19:19.200218763 +0700
  14 @@ -4872,7 +4872,7 @@
  15         else
  16                 icu_cv_host_frag=mh-linux-va
  17         fi ;;
  18 -*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
  19 +*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu|*-*-*-androideabi*) icu_cv_host_frag=mh-linux ;;
  20  i[34567]86-*-cygwin)
  21         if test "$GCC" = yes; then
  22                 icu_cv_host_frag=mh-cygwin
  23 @@ -6032,6 +6032,10 @@
  24  # Check to see if genccode can generate simple assembly.
  25  GENCCODE_ASSEMBLY=
  26  case "${host}" in
  27 +arm-*-linux-androideabi)
  28 +    if test "$GCC" = yes; then
  29 +        GENCCODE_ASSEMBLY="-a gcc-android-arm"
  30 +    fi ;;
  31  *-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu)
  32      if test "$GCC" = yes; then
  33          # We're using gcc, and the simple -a gcc command line works for genccode
  34 @@ -7104,6 +7108,10 @@
  35      # wchar_t can be used
  36      CHECK_UTF16_STRING_RESULT="available"
  37      ;;
  38 +*-*-*-androideabi|mips-unknown-linux-android)
  39 +    # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t
  40 +    CHECK_UTF16_STRING_RESULT="nope"
  41 +    ;;
  42  *)
  43      ;;
  44  esac
  45
  46 --- misc/icu/source/common/unicode/platform.h   2013-10-05 03:49:10.000000000 +0700
  47 +++ misc/build/icu/source/common/unicode/platform.h     2013-11-10 17:22:27.160217186 +0700
  48 @@ -703,7 +703,7 @@
  49  #elif defined(U_STATIC_IMPLEMENTATION)
  50  #   define U_EXPORT
  51  #elif defined(__GNUC__)
  52 -#   define U_EXPORT __attribute__((visibility("default")))
  53 +#   define U_EXPORT
  54  #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \
  55     || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550)
  56  #   define U_EXPORT __global
  57