diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 20:02:31 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-18 07:00:22 +0000 |
| commit | 13818a69d77a5806e2bafa92283a56a9f7ac690d (patch) | |
| tree | 173acbf5d37302ac3848d8de99fcebae64d7606f /external/icu/icu4c-android.patch | |
| parent | 0ba2b78a07e1111208eef45813e14c33c95cef6d (diff) | |
fdo#70393: move icu to a subdir of external
Change-Id: I9d8191848b093240f79207446afb13ca6fd708e4
Reviewed-on: https://gerrit.libreoffice.org/6309
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/icu/icu4c-android.patch')
| -rw-r--r-- | external/icu/icu4c-android.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/external/icu/icu4c-android.patch b/external/icu/icu4c-android.patch new file mode 100644 index 000000000000..55764a12bbf3 --- /dev/null +++ b/external/icu/icu4c-android.patch @@ -0,0 +1,65 @@ +--- misc/icu/source/config/mh-linux ++++ misc/build/icu/source/config/mh-linux +@@ -30,7 +30,7 @@ + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. +- LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) ++# LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) + #SH# # We can't depend on MIDDLE_SO_TARGET being set. + #SH# LD_SONAME= + +--- misc/icu/source/configure ++++ misc/build/icu/source/configure +@@ -5053,7 +5053,7 @@ + else + icu_cv_host_frag=mh-linux-va + fi ;; +-*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;; ++*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu|*-*-*-androideabi*) icu_cv_host_frag=mh-linux ;; + *-*-cygwin|*-*-mingw32|*-*-mingw64) + if test "$GCC" = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -6127,6 +6127,9 @@ + # Check to see if genccode can generate simple assembly. + GENCCODE_ASSEMBLY= + case "${host}" in ++arm-*-linux-androideabi) ++ GENCCODE_ASSEMBLY="-a gcc-android-arm" ++ ;; + *-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu) + if test "$GCC" = yes; then + # We're using gcc, and the simple -a gcc command line works for genccode +@@ -7200,6 +7203,10 @@ + # wchar_t can be used + CHECK_UTF16_STRING_RESULT="available" + ;; ++*-*-*-androideabi|mips-unknown-linux-android) ++ # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t ++ CHECK_UTF16_STRING_RESULT="nope" ++ ;; + *) + ;; + esac +--- misc/icu/source/common/putilimp.h ++++ misc/build/icu/source/common/putilimp.h +@@ -86,6 +86,8 @@ + /* Use the predefined value. */ + #elif U_PLATFORM_HAS_WIN32_API + # define U_HAVE_NL_LANGINFO_CODESET 0 ++#elif defined(__ANDROID__) ++# define U_HAVE_NL_LANGINFO_CODESET 0 + #else + # define U_HAVE_NL_LANGINFO_CODESET 1 + #endif +--- misc/icu/source/common/unicode/platform.h ++++ misc/build/icu/source/common/unicode/platform.h +@@ -641,7 +641,7 @@ + #elif defined(U_STATIC_IMPLEMENTATION) + # define U_EXPORT + #elif defined(__GNUC__) +-# define U_EXPORT __attribute__((visibility("default"))) ++# define U_EXPORT + #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ + || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) + # define U_EXPORT __global |