mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update suggested versions in android build script

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2015-07-09 00:42:10 +02:00 • committed by Dirk Hohndel
parent 016c56a210
commit a558f09f8d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packaging/android/build.sh
View file

@ -9,11 +9,11 @@ popd
# Configure where we can find things here # Configure where we can find things here
export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e
export ANDROID_SDK_ROOT=$SUBSURFACE_SOURCE/../android-sdk-linux export ANDROID_SDK_ROOT=$SUBSURFACE_SOURCE/../android-sdk-linux
export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.4 export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5
export ANDROID_NDK_HOST=linux-x86 export ANDROID_NDK_HOST=linux-x86
# Which versions are we building against? # Which versions are we building against?
SQLITE_VERSION=3080704 SQLITE_VERSION=3081002
LIBXML2_VERSION=2.9.2 LIBXML2_VERSION=2.9.2
LIBXSLT_VERSION=1.1.28 LIBXSLT_VERSION=1.1.28
LIBZIP_VERSION=0.11.2 LIBZIP_VERSION=0.11.2
@ -43,7 +43,7 @@ export CC=${BUILDROOT}/ndk-$ARCH/bin/${BUILDCHAIN}-gcc
export CXX=${BUILDROOT}/ndk-$ARCH/bin/${BUILDCHAIN}-g++ export CXX=${BUILDROOT}/ndk-$ARCH/bin/${BUILDCHAIN}-g++
if [ ! -e sqlite-autoconf-${SQLITE_VERSION}.tar.gz ] ; then if [ ! -e sqlite-autoconf-${SQLITE_VERSION}.tar.gz ] ; then
wget http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_VERSION}.tar.gz wget http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_VERSION}.tar.gz
fi fi
if [ ! -e sqlite-autoconf-${SQLITE_VERSION} ] ; then if [ ! -e sqlite-autoconf-${SQLITE_VERSION} ] ; then
tar -zxf sqlite-autoconf-${SQLITE_VERSION}.tar.gz tar -zxf sqlite-autoconf-${SQLITE_VERSION}.tar.gz
@ -52,7 +52,7 @@ if [ ! -e $PKG_CONFIG_LIBDIR/sqlite3.pc ] ; then
mkdir -p sqlite-build-$ARCH mkdir -p sqlite-build-$ARCH
pushd sqlite-build-$ARCH pushd sqlite-build-$ARCH
../sqlite-autoconf-${SQLITE_VERSION}/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared ../sqlite-autoconf-${SQLITE_VERSION}/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared
make -j4 make
make install make install
popd popd
fi fi
@ -69,7 +69,7 @@ if [ ! -e $PKG_CONFIG_LIBDIR/libxml-2.0.pc ] ; then
../libxml2-${LIBXML2_VERSION}/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --without-python --without-iconv --enable-static --disable-shared ../libxml2-${LIBXML2_VERSION}/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --without-python --without-iconv --enable-static --disable-shared
perl -pi -e 's/runtest\$\(EXEEXT\)//' Makefile perl -pi -e 's/runtest\$\(EXEEXT\)//' Makefile
perl -pi -e 's/testrecurse\$\(EXEEXT\)//' Makefile perl -pi -e 's/testrecurse\$\(EXEEXT\)//' Makefile
make -j4 make
make install make install
popd popd
fi fi