X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=1031ba5eb596105cf428ab5dc9a52c49bcbdc1b5;hp=2004fb40d8e94e9b73da747e8d5dd38e9663a0e6;hb=67b2de8a399c2feba3e7c7aa3f2be71dd5839dca;hpb=510f5ccb4e0804b50a537cfacf6f742f0003c8ee diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index 2004fb4..1031ba5 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -52,15 +52,17 @@ PARALLEL="-j 2" # ----------------------------------------------------------------------------- VER_LIBICONV=1.14 -VER_GETTEXT=0.18.3 +VER_GETTEXT=0.19.2 VER_ZLIB=1.2.8 -VER_PCRE=8.33 -VER_LIBFFI=3.0.13 -VER_GLIB=2.38.2 -VER_GLIB_SHORT=2.38 -VER_LIBZIP=0.11.1 +VER_PCRE=8.35 +VER_LIBFFI=3.1 +VER_GLIB=2.41.3 +VER_GLIB_SHORT=2.41 +VER_LIBSIGCXX=2.3.2 +VER_LIBSIGCXX_SHORT=2.3 +VER_LIBZIP=0.11.2 VER_LIBFTDI1=1.1 -VER_LIBUSBX=1.0.17 +VER_LIBUSB=1.0.19 VER_PYTHON=3.3.3 VER_BOOST=1.55.0 VER_QT=5.3.1 @@ -109,6 +111,20 @@ 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}" +# Look for STL, needed to build bindings +NDK_TOOLCHAIN_VERSION=`${TOOLCHAIN_TRIPLET}-gcc --version | head -1 | sed -e 's/.* \([0-9]\+\.[0-9.]\+\)\( \|.*\)$/\1/'` +STL_BASE="${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}" +if [ -d ${STL_BASE}/include ]; then + CPPFLAGS_STL="-I${STL_BASE}/include -I${STL_BASE}/libs/${TARGET_ARCH}/include" + LDFLAGS_STL="-L${STL_BASE}/libs/${TARGET_ARCH} -Wl,-rpath=${STL_BASE}/libs/${TARGET_ARCH}" + BINDINGS_CONFIG="--enable-bindings" +else + echo "Warning: STL unavailable, libsigrok bindings will not be built." + CPPFLAGS_STL= + LDFLAGS_STL= + BINDINGS_CONFIG="--disable-bindings" +fi + # ----------------------------------------------------------------------------- # Get the latest versions of config.guess/config.sub that know about Android. @@ -213,9 +229,9 @@ make install cd .. # 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 +$WGET http://$SF_MIRROR/project/libusb/libusb-1.0/libusb-$VER_LIBUSB/libusb-$VER_LIBUSB.tar.bz2 +tar xfj libusb-$VER_LIBUSB.tar.bz2 +cd libusb-$VER_LIBUSB patch -p1 < ../../libusb-1.0.patch ./configure $C --disable-udev make $PARALLEL @@ -226,7 +242,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 . +cmake $CM -DFTDIPP=OFF . make $PARALLEL make install cd .. @@ -235,37 +251,71 @@ cd .. $GIT_CLONE git://sigrok.org/libserialport cd libserialport ./autogen.sh -./configure $C +mkdir build +cd build +../configure $C make $PARALLEL V=1 make install -cd .. +cd ../.. + +# Build dependencies for libsigrok bindings if needed + +if [ x"$CPPFLAGS_STL" != x ]; then + + # libsigc++ (needed for glibmm) + $WGET http://ftp.gnome.org/pub/gnome/sources/libsigc++/$VER_LIBSIGCXX_SHORT/libsigc++-$VER_LIBSIGCXX.tar.xz + tar xJf libsigc++-$VER_LIBSIGCXX.tar.xz + cd libsigc++-$VER_LIBSIGCXX + cp -f ../config/config.guess build + cp -f ../config/config.sub build + CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure $C + make $PARALLEL + make install + cd .. + + # glibmm (needed for libsigrok bindings) + $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIB_SHORT/glibmm-$VER_GLIB.tar.xz + tar xJf glibmm-$VER_GLIB.tar.xz + cd glibmm-$VER_GLIB + CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure $C + make $PARALLEL + make install + cd .. + +fi # libsigrok $GIT_CLONE git://sigrok.org/libsigrok cd libsigrok ./autogen.sh -./configure $C --datadir=/sdcard +mkdir build +cd build +CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard make $PARALLEL V=1 -make install -cd .. +make datadir='$(datarootdir)' install +cd ../.. # libsigrokdecode $GIT_CLONE git://sigrok.org/libsigrokdecode cd libsigrokdecode ./autogen.sh -./configure $C +mkdir build +cd build +../configure $C make $PARALLEL V=1 make install -cd .. +cd ../.. # sigrok-cli $GIT_CLONE git://sigrok.org/sigrok-cli cd sigrok-cli ./autogen.sh -./configure $C +mkdir build +cd build +../configure $C make $PARALLEL V=1 make install -cd .. +cd ../.. # Check if we have all requirements to build PulseView: @@ -289,7 +339,6 @@ if [ ! -e "${ANDROID_SDK}/tools/android" ]; then 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) @@ -298,7 +347,7 @@ 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 +echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : \"-I$PREFIX/include $CPPFLAGS_STL\" \"-L$PREFIX/lib $LDFLAGS_STL -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 $PARALLEL cd ..