X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=6dbda3b757f5ed6a263764aa43b5e559f0d1122d;hp=825bc154b9cead85e4005e7bc563952f415c30e7;hb=f0e760bb48f29a3a3e839a0b85882bbe622943b8;hpb=b118df5fb825d432114df46aed96aa1b363258b7

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 825bc15..6dbda3b 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -65,29 +65,36 @@ 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 ..
-
-## # TODO: Needs libiconv
-## # gettext (needed for glib)
-## wget http://ftp.gnu.org/pub/gnu/gettext/gettext-$VER_GETTEXT.tar.gz
-## tar xfz gettext-$VER_GETTEXT.tar.gz
-## cd gettext-$VER_GETTEXT
-## ./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 ..
+
+# gettext (needed for glib)
+wget http://ftp.gnu.org/pub/gnu/gettext/gettext-$VER_GETTEXT.tar.gz
+tar xfz gettext-$VER_GETTEXT.tar.gz
+cd gettext-$VER_GETTEXT
+./configure $C --enable-shared --disable-libasprintf
+cd gettext-runtime
+make
+make install
+cd ../..
 
 # zlib (needed for glib and libzip)
 wget http://zlib.net/zlib-$VER_ZLIB.tar.gz
@@ -103,7 +110,7 @@ cd ..
 wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz
 tar xfvz pcre-$VER_PCRE.tar.gz
 cd pcre-$VER_PCRE
-./configure $C
+./configure $C --disable-cpp
 make
 make install
 cd ..
@@ -117,15 +124,15 @@ make
 make install
 cd ..
 
-## # TODO: Not all build-dependencies build, yet.
 ## # glib
-## wget ftp://ftp.gnome.org/pub/gnome/sources/glib/2.34/glib-$VER_GLIB.tar.xz
-## tar xfJ glib-$VER_GLIB.tar.xz
-## cd glib-$VER_GLIB
-## ./configure $C
-## make
-## make install
-## cd ..
+wget https://github.com/djdeath/glib/archive/android.zip
+unzip android.zip
+cd glib-android
+./autogen.sh
+LDFLAGS=-L$PREFIX/lib CPPFLAGS=-I$PREFIX/include glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_func_posix_getpwuid_r=no ac_cv_func_posix_getgrgid_r=no ./configure $C --disable-modular-tests
+make
+make install
+cd ..
 
 # libzip
 wget http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
@@ -145,8 +152,9 @@ cd libusb-$VER_LIBUSB
 cp -f ../config/config.guess .
 cp -f ../config/config.sub .
 ./configure $C
-make
-make install
+# explicitly exclude libusbpp.la from lib_LTLIBRARIES, and skip subdirs
+make lib_LTLIBRARIES=libusb.la SUBDIRS=.
+make lib_LTLIBRARIES=libusb.la SUBDIRS=. install
 cd ..
 
 # libftdi