summaryrefslogtreecommitdiffstats
path: root/external/icu/icu4c-android.patch.1
blob: c62cf54e5936b6068aba810c02302cd1bb510e8b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
diff -ur icu.org/source/common/unicode/platform.h icu/source/common/unicode/platform.h
--- icu.org/source/common/unicode/platform.h	2017-03-22 20:06:26.000000000 +0100
+++ icu/source/common/unicode/platform.h	2017-04-21 22:32:31.656693147 +0200
@@ -818,7 +818,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
diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux
--- icu.org/source/config/mh-linux	2016-06-15 20:58:17.000000000 +0200
+++ icu/source/config/mh-linux	2017-04-21 22:32:31.653693154 +0200
@@ -27,7 +27,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=
 
diff -ur icu.org/source/configure icu/source/configure
--- icu.org/source/configure	2017-04-07 09:40:30.000000000 +0200
+++ icu/source/configure	2017-04-21 22:32:31.656693147 +0200
@@ -5134,7 +5134,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 ;;
 i[34567]86-*-cygwin)
 	if test "$GCC" = yes; then
 		icu_cv_host_frag=mh-cygwin
@@ -6358,6 +6358,10 @@
 # Check to see if genccode can generate simple assembly.
 GENCCODE_ASSEMBLY=
 case "${host}" in
+arm-*-linux-androideabi)
+    if test "$GCC" = yes; then
+        GENCCODE_ASSEMBLY="-a gcc-android-arm"
+    fi ;;
 *-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
@@ -7445,6 +7449,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