X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=e6f8ed9fc20d215240574ee5dfc3f74543a66d4e;hp=d746db291f23c9fd26339877c30948028486e65b;hb=a4aed0610040e7412f464be712ce2dd48c45f431;hpb=6bebfd4ebb6a0a75a9836803bc15ed34b1c61cc3 diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index d746db2..e6f8ed9 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -26,7 +26,7 @@ set -e ANDROID_PATH=$HOME/android # The path where the Android NDK is located. -ANDROID_NDK=$ANDROID_PATH/android-ndk-r10d +ANDROID_NDK=$ANDROID_PATH/android-ndk-r10e # The path where the Android SDK is located. ANDROID_SDK=$ANDROID_PATH/android-sdk-linux @@ -62,28 +62,32 @@ PARALLEL="-j 2" # ----------------------------------------------------------------------------- VER_LIBICONV=1.14 -VER_GETTEXT=0.19.4 +VER_GETTEXT=0.19.7 VER_ZLIB=1.2.8 -VER_PCRE=8.36 +VER_PCRE=8.38 VER_LIBFFI=3.2.1 -VER_GLIB=2.43.3 -VER_GLIB_SHORT=2.43 -VER_LIBSIGCXX=2.4.0 -VER_LIBSIGCXX_SHORT=2.4 -VER_LIBZIP=0.11.2 +VER_GLIB=2.48.1 +VER_GLIB_SHORT=2.48 +VER_GLIBMM=2.48.1 +VER_GLIBMM_SHORT=2.48 +VER_LIBSIGCXX=2.9.2 +VER_LIBSIGCXX_SHORT=2.9 +VER_LIBZIP=1.1 VER_LIBFTDI1=1.2 VER_LIBUSB=1.0.19 VER_PYTHON=3.3.3 -VER_BOOST=1.57.0 -VER_QT=5.4.1 -VER_NDK=10d -VER_SDK=23.0.2 -VER_AND_BT=22.0.1 # Android build tools version +VER_BOOST=1.58.0 +VER_QT=5.6.0 +VER_QT_SHORT=5.6 +VER_SIGROK_FIRMWARE_FX2LAFW=0.1.3 +VER_NDK=10e +VER_SDK=24.4.1 +VER_AND_BT=23.0.2 # Android build tools version VER_AND_API=16 # Target Android API version SF_MIRROR=download.sourceforge.net -WGET="wget --quiet" +WGET="wget -c --quiet" GIT_CLONE="git clone --depth=1" case "$TOOLCHAIN_TRIPLET" in @@ -103,15 +107,15 @@ if [ "x$1" = "xprepare" ]; then # NDK $WGET http://dl.google.com/android/ndk/android-ndk-r$VER_NDK-linux-x86.bin chmod 700 android-ndk-r$VER_NDK-linux-x86.bin - ./android-ndk-r$VER_NDK-linux-x86.bin + ./android-ndk-r$VER_NDK-linux-x86.bin -y cd android-ndk-r$VER_NDK - ./build/tools/make-standalone-toolchain.sh --platform=android-VER_AND_API \ + ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \ --toolchain=arm-linux-androideabi-4.9 \ --install-dir=$ANDROID_PATH/android-arm-toolchain - ./build/tools/make-standalone-toolchain.sh --platform=android-VER_AND_API \ + ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \ --toolchain=x86-4.9 \ --install-dir=$ANDROID_PATH/android-i686-toolchain - ./build/tools/make-standalone-toolchain.sh --platform=android-VER_AND_API \ + ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \ --toolchain=mipsel-linux-android-4.9 \ --install-dir=$ANDROID_PATH/android-mipsel-toolchain cd .. @@ -120,7 +124,7 @@ if [ "x$1" = "xprepare" ]; then $WGET http://dl.google.com/android/android-sdk_r$VER_SDK-linux.tgz tar xfz android-sdk_r$VER_SDK-linux.tgz cd android-sdk-linux - ./tools/android update sdk --no-ui --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API + echo y | ./tools/android update sdk --no-ui --all --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API cd .. exit @@ -204,10 +208,10 @@ fi # ----------------------------------------------------------------------------- # Get the latest versions of config.guess/config.sub that know about Android. -$GIT_CLONE git://git.savannah.gnu.org/config.git +$GIT_CLONE http://git.savannah.gnu.org/r/config.git # Get a toolchain for cmake that knows about Android. -$WGET https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake +$WGET https://raw.githubusercontent.com/arithran/android-cmake/master/toolchain/android.toolchain.cmake patch < ../android.toolchain.cmake.patch android.toolchain.cmake # ----------------------------------------------------------------------------- @@ -220,6 +224,8 @@ autoreconf patch -p1 < ../../Python-$VER_PYTHON.patch ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6 sed -i "s/^#zlib/zlib/g" Modules/Setup +sed -i "s/^#math/math/g" Modules/Setup +sed -i "s/^#time/time/g" Modules/Setup make PYTHON_FOR_BUILD='_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) ./hostpython' install $V cd .. @@ -318,7 +324,7 @@ cd .. $WGET http://www.intra2net.com/en/developer/libftdi/download/libftdi1-$VER_LIBFTDI1.tar.bz2 tar xfj libftdi1-$VER_LIBFTDI1.tar.bz2 cd libftdi1-$VER_LIBFTDI1 -cmake $CM -DFTDIPP=no -DDOCUMENTATION=no -DEXAMPLES=no -DFTDI_EEPROM=no -DPYTHON_BINDINGS=no . +cmake $CM -DFTDIPP=no -DDOCUMENTATION=no -DEXAMPLES=no -DFTDI_EEPROM=no -DPYTHON_BINDINGS=no -DBUILD_TESTS=n . make $PARALLEL $V make install $V cd .. @@ -350,9 +356,9 @@ if [ x"$CPPFLAGS_STL" != x ]; then cd .. # glibmm (needed for libsigrok bindings) - $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIB_SHORT/glibmm-$VER_GLIB.tar.xz - tar xfJ glibmm-$VER_GLIB.tar.xz - cd glibmm-$VER_GLIB + $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIBMM_SHORT/glibmm-$VER_GLIBMM.tar.xz + tar xfJ glibmm-$VER_GLIBMM.tar.xz + cd glibmm-$VER_GLIBMM CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure --disable-documentation $C make $PARALLEL $V make install $V @@ -382,6 +388,24 @@ make $PARALLEL $V make install $V cd ../.. +# sigrok-firmware +$GIT_CLONE git://sigrok.org/sigrok-firmware +cd sigrok-firmware +./autogen.sh +mkdir build +cd build +../configure $C +make $PARALLEL $V +make install $V +cd ../.. + +# sigrok-firmware-fx2lafw +$WGET http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW.tar.gz +tar xfz sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW.tar.gz +cd sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW +cp *.fw $PREFIX/share/sigrok-firmware/ +cd .. + # sigrok-cli $GIT_CLONE git://sigrok.org/sigrok-cli cd sigrok-cli @@ -422,8 +446,8 @@ echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" :