X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=ffd61d32f90c1b0d6943dfef04dc5b821af0f699;hp=a1334aa9e5558a82e10a66eb361772b288e402d4;hb=ffbad1654cdd9263a964873d95535ed66a5011b4;hpb=e7fe442d949f8d1cefb8c63f32335d2404817026
diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index a1334aa..ffd61d3 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -16,8 +16,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## along with this program; if not, see .
##
set -e
@@ -32,10 +31,10 @@ ANDROID_NDK=$ANDROID_PATH/android-ndk-r10e
ANDROID_SDK=$ANDROID_PATH/android-sdk-linux
# The path where your Android toolchain directory is located.
-TOOLCHAIN=$ANDROID_PATH/android-arm-toolchain
+# TOOLCHAIN=$ANDROID_PATH/android-arm-toolchain
# TOOLCHAIN=$ANDROID_PATH/android-mipsel-toolchain
# TOOLCHAIN=$ANDROID_PATH/android-i686-toolchain
-# TOOLCHAIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86
+TOOLCHAIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86
# TOOLCHAIN=$ANDROID_NDK/toolchains/x86-4.9/prebuilt/linux-x86
# TOOLCHAIN=$ANDROID_NDK/toolchains/mipsel-linux-android-4.9/prebuilt/linux-x86
@@ -63,15 +62,15 @@ PARALLEL="-j 2"
VER_LIBICONV=1.14
VER_GETTEXT=0.19.7
-VER_ZLIB=1.2.8
+VER_ZLIB=1.2.11
VER_PCRE=8.38
VER_LIBFFI=3.2.1
-VER_GLIB=2.45.4
-VER_GLIB_SHORT=2.45
-VER_GLIBMM=2.45.41
-VER_GLIBMM_SHORT=2.45
-VER_LIBSIGCXX=2.6.2
-VER_LIBSIGCXX_SHORT=2.6
+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
@@ -90,6 +89,8 @@ SF_MIRROR=download.sourceforge.net
WGET="wget -c --quiet"
GIT_CLONE="git clone --depth=1"
+REPO_BASE="git://sigrok.org"
+
case "$TOOLCHAIN_TRIPLET" in
arm*) TARGET_ARCH=armeabi;;
mips*) TARGET_ARCH=mips;;
@@ -208,10 +209,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
# -----------------------------------------------------------------------------
@@ -226,6 +227,7 @@ ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fd
sed -i "s/^#zlib/zlib/g" Modules/Setup
sed -i "s/^#math/math/g" Modules/Setup
sed -i "s/^#time/time/g" Modules/Setup
+sed -i "s/^#_struct/_struct/g" Modules/Setup
make PYTHON_FOR_BUILD='_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) ./hostpython' install $V
cd ..
@@ -271,10 +273,10 @@ make install $V
cd ..
# pcre (needed for glib)
-$WGET ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz
+$WGET https://ftp.pcre.org/pub/pcre/pcre-$VER_PCRE.tar.gz
tar xfz pcre-$VER_PCRE.tar.gz
cd pcre-$VER_PCRE
-./configure $C --disable-cpp
+./configure $C --disable-cpp --enable-utf --enable-unicode-properties
make $PARALLEL $V
make install $V
cd ..
@@ -330,7 +332,7 @@ make install $V
cd ..
# libserialport
-$GIT_CLONE git://sigrok.org/libserialport
+$GIT_CLONE $REPO_BASE/libserialport
cd libserialport
./autogen.sh
mkdir build
@@ -367,18 +369,18 @@ if [ x"$CPPFLAGS_STL" != x ]; then
fi
# libsigrok
-$GIT_CLONE git://sigrok.org/libsigrok
+$GIT_CLONE $REPO_BASE/libsigrok
cd libsigrok
./autogen.sh
mkdir build
cd build
-CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard
+CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" JAVAC="javac -source 1.6 -target 1.6" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard
make $PARALLEL $V
make datadir='$(datarootdir)' install $V
cd ../..
# libsigrokdecode
-$GIT_CLONE git://sigrok.org/libsigrokdecode
+$GIT_CLONE $REPO_BASE/libsigrokdecode
cd libsigrokdecode
./autogen.sh
mkdir build
@@ -389,7 +391,7 @@ make install $V
cd ../..
# sigrok-firmware
-$GIT_CLONE git://sigrok.org/sigrok-firmware
+$GIT_CLONE $REPO_BASE/sigrok-firmware
cd sigrok-firmware
./autogen.sh
mkdir build
@@ -407,7 +409,7 @@ cp *.fw $PREFIX/share/sigrok-firmware/
cd ..
# sigrok-cli
-$GIT_CLONE git://sigrok.org/sigrok-cli
+$GIT_CLONE $REPO_BASE/sigrok-cli
cd sigrok-cli
./autogen.sh
mkdir build
@@ -440,15 +442,16 @@ NDK_HOST=`"$ANDROID_NDK/ndk-build" -p 2>/dev/null | awk '$1 == "HOST_TAG" { prin
$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//./_}
-CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread,test --without-icu
+patch -p0 < ../../boost_wchar.patch
+CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,serialization,test --without-icu
echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : \"$SYSROOT -I$PREFIX/include $CPPFLAGS_STL\" \"$SYSROOT -L$PREFIX/lib $LDFLAGS_STL -lgnustl_shared\" ;" > user-config.jam
./b2 -q -d+2 --ignore-site-config --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)
-$WGET http://download.qt.io/snapshots/qt/${VER_QT_SHORT}/${VER_QT}-beta/latest_src/qt-everywhere-opensource-src-${VER_QT}-beta.tar.gz
-tar xfz qt-everywhere-opensource-src-${VER_QT}-beta.tar.gz
-cd qt-everywhere-opensource-src-${VER_QT}-beta
+$WGET http://download.qt.io/official_releases/qt/${VER_QT_SHORT}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.xz
+tar xfi qt-everywhere-opensource-src-${VER_QT}.tar.xz
+cd qt-everywhere-opensource-src-${VER_QT}
patch -p1 < ../../android-qt.patch
CC= CXX= ./configure \
--prefix="$PREFIX" \
@@ -481,7 +484,7 @@ make install $V
cd ..
# sigrok-androidutils
-$GIT_CLONE git://sigrok.org/sigrok-androidutils
+$GIT_CLONE $REPO_BASE/sigrok-androidutils
cd sigrok-androidutils
./autogen.sh
./configure $C --with-android-sdk="${ANDROID_SDK}" --with-android-platform=android-$VER_AND_API
@@ -493,9 +496,10 @@ cd ..
find $PREFIX -iname "*.so" -exec ${TOOLCHAIN_TRIPLET}-strip -S {} \;
# PulseView
-$GIT_CLONE git://sigrok.org/pulseview
+$GIT_CLONE $REPO_BASE/pulseview
cd pulseview
patch -p1 < ../../pv_cmake_pkgconfig_fix.patch
+sed -i -e "s,\t\tandroid:versionName=.*$,\t\tandroid:versionName=\"`date -Iseconds`\"," android/AndroidManifest.xml
cmake $CM -DENABLE_TESTS=y .
make $PARALLEL $V
${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so