Fixed compilation for NDK r10e

Author: pelya

README.md

@@ -3,7 +3,7 @@ libiconv-libicu-android
 
 Port of libiconv and libicu to Android
 
-You will need NDK r9b, curl, autoconf, automake, libtool, and git installed.
+You will need NDK r10e, curl, autoconf, automake, libtool, and git installed.
 
 There are no sources and no patches - everything is done with magical build scripts,
 just run build.sh and enjoy.

build.sh

@@ -35,7 +35,7 @@ cd $BUILDDIR/$ARCH
 
 [ -e libiconv.so ] || {
 
-	[ -d libiconv-1.14 ] || curl http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz | tar xvz || exit 1
+	[ -d libiconv-1.14 ] || curl -L http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz | tar xvz || exit 1
 
 	cd libiconv-1.14
 

setCrossEnvironment-armeabi-v7a.sh

@@ -22,7 +22,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 
 [ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=arm-linux-androideabi
-GCCVER=4.6
+GCCVER=4.8
 PLATFORMVER=android-14
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then

setCrossEnvironment-armeabi.sh

@@ -22,7 +22,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 
 [ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=arm-linux-androideabi
-GCCVER=4.6
+GCCVER=4.8
 PLATFORMVER=android-14
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then

setCrossEnvironment-mips.sh

@@ -22,7 +22,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 
 [ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=mipsel-linux-android
-GCCVER=4.6
+GCCVER=4.8
 PLATFORMVER=android-14
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then

setCrossEnvironment-x86.sh

@@ -22,7 +22,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 
 [ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=i686-linux-android
-GCCVER=4.6
+GCCVER=4.8
 PLATFORMVER=android-14
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then