icu/icu4c-android.patch

   1 --- misc/icu/source/config/mh-linux
   2 +++ misc/build/icu/source/config/mh-linux
   3 @@ -30,7 +30,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
  13 +++ misc/build/icu/source/configure
  14 @@ -5053,7 +5053,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  *-*-cygwin|*-*-mingw32)
  21         if test "$GCC" = yes; then
  22                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  23 @@ -6127,6 +6127,9 @@
  24  # Check to see if genccode can generate simple assembly.
  25  GENCCODE_ASSEMBLY=
  26  case "${host}" in
  27 +arm-*-linux-androideabi)
  28 +    GENCCODE_ASSEMBLY="-a gcc-android-arm"
  29 +    ;;
  30  *-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu)
  31      if test "$GCC" = yes; then
  32          # We're using gcc, and the simple -a gcc command line works for genccode
  33 @@ -7200,6 +7203,10 @@
  34      # wchar_t can be used
  35      CHECK_UTF16_STRING_RESULT="available"
  36      ;;
  37 +*-*-*-androideabi|mips-unknown-linux-android)
  38 +    # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t
  39 +    CHECK_UTF16_STRING_RESULT="nope"
  40 +    ;;
  41  *)
  42      ;;
  43  esac
  44 --- misc/icu/source/common/putilimp.h
  45 +++ misc/build/icu/source/common/putilimp.h
  46 @@ -86,6 +86,8 @@
  47      /* Use the predefined value. */
  48  #elif U_PLATFORM_HAS_WIN32_API
  49  #   define U_HAVE_NL_LANGINFO_CODESET 0
  50 +#elif defined(__ANDROID__)
  51 +#   define U_HAVE_NL_LANGINFO_CODESET 0
  52  #else
  53  #   define U_HAVE_NL_LANGINFO_CODESET 1
  54  #endif
  55 @@ -114,6 +114,8 @@
  56
  57  #ifdef U_TIMEZONE
  58      /* Use the predefined value. */
  59 +#elif defined(__ANDROID__)
  60 +#   define U_TIMEZONE timezone
  61  #elif U_PLATFORM_IS_LINUX_BASED
  62  #   define U_TIMEZONE __timezone
  63  #elif U_PLATFORM_USES_ONLY_WIN32_API
  64 --- misc/icu/source/common/unicode/platform.h
  65 +++ misc/build/icu/source/common/unicode/platform.h
  66 @@ -641,7 +641,7 @@
  67  #elif defined(U_STATIC_IMPLEMENTATION)
  68  #   define U_EXPORT
  69  #elif defined(__GNUC__)
  70 -#   define U_EXPORT __attribute__((visibility("default")))
  71 +#   define U_EXPORT
  72  #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \
  73     || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550)
  74  #   define U_EXPORT __global