X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=2004fb40d8e94e9b73da747e8d5dd38e9663a0e6;hb=510f5ccb4e0804b50a537cfacf6f742f0003c8ee;hp=f802a5d7b977a85ac59f11e5f231fe7fe9fc4b68;hpb=621e2e6eaa182ed9c0c2fa5b3818387e39dfe8c9;p=sigrok-util.git diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index f802a5d..2004fb4 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -21,10 +21,10 @@ set -e -# The path where Android NDK is located. +# The path where the Android NDK is located. ANDROID_NDK=$HOME/android/android-ndk-r9d -# The path where Android SDK is located. +# The path where the Android SDK is located. ANDROID_SDK=$HOME/android/android-sdk-linux # The path where your Android toolchain directory is located. @@ -74,7 +74,7 @@ case "$TOOLCHAIN_TRIPLET" in arm*) TARGET_ARCH=armeabi;; mips*) TARGET_ARCH=mips;; i686*) TARGET_ARCH=x86;; - *) echo >&2 "Unknown prefix for TOOLCHAIN_TRIPLET"; exit 1;; + *) echo >&2 "Unknown prefix for TOOLCHAIN_TRIPLET."; exit 1;; esac # ----------------------------------------------------------------------------- @@ -84,12 +84,15 @@ rm -rf $BUILDDIR mkdir $BUILDDIR cd $BUILDDIR +# ----------------------------------------------------------------------------- + # Build host Python before we start messing with the environment. +# Don't do parallel builds, this doesn't seem to work well. $WGET http://python.org/ftp/python/$VER_PYTHON/Python-$VER_PYTHON.tar.xz tar xJf Python-$VER_PYTHON.tar.xz cd Python-$VER_PYTHON ./configure -make python $PARALLEL +make python mv python hostpython cd .. @@ -106,23 +109,26 @@ export -n PKG_CONFIG_PATH C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX" CM="-Wno-dev -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_ABI=${TARGET_ARCH} -DCMAKE_INSTALL_PREFIX=${PREFIX} -DANDROID_STANDALONE_TOOLCHAIN=${TOOLCHAIN}" +# ----------------------------------------------------------------------------- + # Get the latest versions of config.guess/config.sub that know about Android. $GIT_CLONE git://git.savannah.gnu.org/config.git -# Get a toolchain for cmake that knows about Android -wget https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake +# Get a toolchain for cmake that knows about Android. +$WGET https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake patch < ../android.toolchain.cmake.patch android.toolchain.cmake # ----------------------------------------------------------------------------- # Python (needed for libsigrokdecode) +# Don't do parallel Python builds, this doesn't seem to work well. cd Python-$VER_PYTHON make distclean 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 -make PYTHON_FOR_BUILD=./hostpython install $PARALLEL +make PYTHON_FOR_BUILD=./hostpython install cd .. # libiconv (needed for glib) @@ -184,7 +190,7 @@ make $PARALLEL make install cd .. -# glib +# glib (needed for libsigrok) $WGET http://ftp.gnome.org/pub/gnome/sources/glib/$VER_GLIB_SHORT/glib-$VER_GLIB.tar.xz tar xJf glib-$VER_GLIB.tar.xz cd glib-$VER_GLIB @@ -195,7 +201,7 @@ make $PARALLEL make install cd .. -# libzip +# libzip (needed for libsigrok) $WGET http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz tar xfz libzip-$VER_LIBZIP.tar.gz cd libzip-$VER_LIBZIP @@ -206,7 +212,7 @@ make $PARALLEL make install cd .. -# libusb-1.0 +# libusb-1.0 (needed for libsigrok) $WGET http://$SF_MIRROR/project/libusbx/releases/$VER_LIBUSBX/source/libusbx-$VER_LIBUSBX.tar.bz2 tar xfj libusbx-$VER_LIBUSBX.tar.bz2 cd libusbx-$VER_LIBUSBX @@ -216,7 +222,7 @@ make $PARALLEL make install cd .. -# libftdi1 +# libftdi1 (needed for libsigrok) $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 @@ -261,51 +267,48 @@ make $PARALLEL V=1 make install cd .. - -# Check if we have kit to build PulseView +# Check if we have all requirements to build PulseView: if [ -z "$ANDROID_NDK" -o ! -d "$ANDROID_NDK" ]; then - echo "Android NDK not available, not building PulseView" + echo "Android NDK not available, not building PulseView." exit 0 fi -if [ -z "$ANDROID_SDK" -o ! -d "$ANDROID_SDK"/platforms/android-8 -o \ +if [ -z "$ANDROID_SDK" -o \ + ! -d "$ANDROID_SDK"/platforms/android-8 -o \ ! -d "$ANDROID_SDK"/platforms/android-10 -o \ ! -d "$ANDROID_SDK"/platforms/android-11 -o \ ! -d "$ANDROID_SDK"/platforms/android-14 -o \ ! -d "$ANDROID_SDK"/platforms/android-16 ]; then - echo "Android SDK with platforms 8 10 11 14 16 not available, not building PulseView" + echo "Android SDK with platforms 8 10 11 14 16 not available, not building PulseView." exit 0 fi -ANDROID_TOOLS=${ANDROID_SDK}/tools - -if [ ! -e "$ANDROID_TOOLS/android" ]; then - echo "Essential Android build tools not available, not building PulseView" +if [ ! -e "${ANDROID_SDK}/tools/android" ]; then + echo "Essential Android build tools not available, not building PulseView." exit 0 fi NDK_TOOLCHAIN_VERSION=`${TOOLCHAIN_TRIPLET}-gcc --version | head -1 | sed -e 's/.* \([0-9]\+\.[0-9.]\+\)\( \|.*\)$/\1/'` NDK_HOST=`"$ANDROID_NDK/ndk-build" -p 2>/dev/null | awk '$1 == "HOST_TAG" { print $3 }'` - -# boost (needed for PulseView) +# Boost (needed for PulseView) $WGET http://$SF_MIRROR/project/boost/boost/$VER_BOOST/boost_${VER_BOOST//./_}.tar.bz2 tar xfj boost_${VER_BOOST//./_}.tar.bz2 cd boost_${VER_BOOST//./_} patch -p1 < ../../boost.patch ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system --without-icu echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : \"-I$PREFIX/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/include\" \"-L$PREFIX/lib -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH} -Wl,-rpath=${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH} -lgnustl_shared\" ;" > user-config.jam -./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install +./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install $PARALLEL cd .. -# qt (needed for PulseView) +# Qt (needed for PulseView) $WGET http://download.qt-project.org/official_releases/qt/${VER_QT%.*}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.gz tar xfz qt-everywhere-opensource-src-${VER_QT}.tar.gz cd qt-everywhere-opensource-src-${VER_QT} patch -p1 < ../../android-qt.patch ./configure --prefix="$PREFIX" -developer-build -xplatform android-g++ -nomake tests -nomake examples -android-sdk "$ANDROID_SDK" -android-ndk "$ANDROID_NDK" -android-ndk-host "$NDK_HOST" -android-arch "$TARGET_ARCH" -android-toolchain-version "$NDK_TOOLCHAIN_VERSION" -skip qttranslations -skip qtwebkit -skip qtserialport -skip qtwebkit-examples -skip qtlocation -skip qtconnectivity -opensource -confirm-license -make $PARALLEL +make module-qtbase module-qtandroidextras module-qtsvg module-qtimageformats $PARALLEL make install cd .. @@ -314,7 +317,7 @@ $GIT_CLONE git://sigrok.org/sigrok-androidutils cd sigrok-androidutils ./autogen.sh ./configure $C --with-android-sdk="${ANDROID_SDK}" -make +make $PARALLEL V=1 make install cd .. @@ -322,8 +325,9 @@ cd .. $GIT_CLONE git://sigrok.org/pulseview cd pulseview cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl . -make $PARALLEL +make $PARALLEL VERBOSE=1 cd android -"$ANDROID_TOOLS/android" update project -p . -t android-14 -n PulseView +"${ANDROID_SDK}/tools/android" update project -p . -t android-14 -n PulseView ant debug cd ../.. +