From: Marcus Comstedt <redacted>
Date: Thu, 15 Aug 2013 13:53:23 +0000 (+0200)
Subject: sigrok-cross-android: Fix iconv build
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=85b461722e479e5f8a7a4ddf62dd847e31fa6766;p=sigrok-util.git

sigrok-cross-android: Fix iconv build
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 36de775..9c67c61 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -65,19 +65,26 @@ git clone git://git.savannah.gnu.org/config.git
 
 # -----------------------------------------------------------------------------
 
-## # TODO: Doesn't build yet.
-## # libiconv (needed for glib)
-## wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$VER_LIBICONV.tar.gz
-## tar xfz libiconv-$VER_LIBICONV.tar.gz
-## cd libiconv-$VER_LIBICONV
-## cp -f ../config/config.guess build-aux
-## cp -f ../config/config.sub build-aux
-## cp -f ../config/config.guess libcharset/build-aux
-## cp -f ../config/config.sub libcharset/build-aux
-## ./configure $C
-## make
-## make install
-## cd ..
+# libiconv (needed for glib)
+wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$VER_LIBICONV.tar.gz
+tar xfz libiconv-$VER_LIBICONV.tar.gz
+cd libiconv-$VER_LIBICONV
+cp -f ../config/config.guess build-aux
+cp -f ../config/config.sub build-aux
+cp -f ../config/config.guess libcharset/build-aux
+cp -f ../config/config.sub libcharset/build-aux
+./configure $C --enable-shared
+make lib/localcharset.h
+cd libcharset
+make
+make install
+cd ../lib
+make
+make install
+cd ..
+test -d $PREFIX/include || mkdir $PREFIX/include
+cp include/iconv.h.inst $PREFIX/include/iconv.h
+cd ..
 
 ## # TODO: Needs libiconv
 ## # gettext (needed for glib)