[Libreoffice-commits] core.git: external/icu

[Tor Lillqvist]

 external/icu/icu4c-android.patch |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3e32b0fd7fecbacd05786de2cd8a3bff97ce2b6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Dec 19 18:40:09 2014 +0200

    Make icu4c-android.patch apply again
    
    Change-Id: I98d9fecb0f44b0b4354029bab1a5d675e98edd1f

diff --git a/external/icu/icu4c-android.patch b/external/icu/icu4c-android.patch
index ce8c8b4..0b320a8 100644
--- a/external/icu/icu4c-android.patch
+++ b/external/icu/icu4c-android.patch
@@ -17,9 +17,9 @@
  	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)
+ i[34567]86-*-cygwin)
  	if test "$GCC" = yes; then
- 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ 		icu_cv_host_frag=mh-cygwin
 @@ -6032,6 +6032,10 @@
  # Check to see if genccode can generate simple assembly.
  GENCCODE_ASSEMBLY=