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

iOS: removed local build of sqllite3

Browse source 
script/build.sh uses the builtin sqllite3 and do not build locally,
updated build.sh and Subsurface-mobile.pro to to the same.

Apart from simplifying the script it saves build time

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-05-08 17:27:29 +02:00 • committed by Dirk Hohndel
parent a0030a488a
commit 5aa5398624
2 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
View file

@ -107,12 +107,12 @@ RESOURCES += qml.qrc ../../../subsurface.qrc ../../../mobile-widgets/qml/mobile-
LIBS += ../install-root/lib/libdivecomputer.a \
../install-root/lib/libgit2.a \
../install-root/lib/libsqlite3.a \
../install-root/lib/libzip.a \
../install-root/lib/libxslt.a \
../install-root/lib/libxml2.a \
../googlemaps-build/libqtgeoservices_googlemaps.a \
-liconv
-liconv \
-lsqlite3
INCLUDEPATH += ../install-root/include/ \
../install-root/lib/libzip/include \

32
packaging/ios/build.sh
View file

@ -44,7 +44,6 @@ if [ -z $QT_VERSION ] ; then
fi
# Which versions are we building against?
SQLITE_VERSION=3090200
LIBXML2_VERSION=2.9.2
LIBXSLT_VERSION=1.1.28
LIBZIP_VERSION=0.11.2
@ -66,7 +65,7 @@ LIBFTDI_VERSION=1.2
# CURRENT_LIBSSH2="libssh2-1.8.0" (not used)
# CURRENT_LIBGIT2="v0.26.0" (different, remark the v, which is the branch name)
#
# SQLITE, LIBXSLT and LIBXML2 are only used on this platform
# LIBXSLT and LIBXML2 are only used on this platform
#
# LIBXML2 states a version number, but the repo, does not contain a branch pr release
# so master is used.
@ -134,7 +133,7 @@ echo next building for $ARCH
declare -x LD=`xcrun -sdk $SDK_NAME -find ld`
declare -x CFLAGS="-arch $ARCH_NAME -isysroot $SDK_DIR -miphoneos-version-min=6.0 -I$SDK_DIR/usr/include -fembed-bitcode"
declare -x CXXFLAGS="$CFLAGS"
declare -x LDFLAGS="$CFLAGS -lpthread -lc++ -L$SDK_DIR/usr/lib -fembed-bitcode"
declare -x LDFLAGS="$CFLAGS -lsqlite3 -lpthread -lc++ -L$SDK_DIR/usr/lib -fembed-bitcode"
# openssl build stuff.
@ -153,33 +152,6 @@ echo next building for $ARCH
target=$ARCH
hosttarget=$ARCH
if [ ! -e sqlite-autoconf-${SQLITE_VERSION}.tar.gz ] ; then
curl -O http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_VERSION}.tar.gz
fi
if [ ! -e sqlite-autoconf-${SQLITE_VERSION} ] ; then
tar -zxf sqlite-autoconf-${SQLITE_VERSION}.tar.gz
fi
if [ ! -e $PKG_CONFIG_LIBDIR/sqlite3.pc ] ; then
mkdir -p sqlite-build-$ARCH_NAME
pushd sqlite-build-$ARCH_NAME
CFLAGS="${CFLAGS} -DSQLITE_ENABLE_LOCKING_STYLE=0"
../sqlite-autoconf-${SQLITE_VERSION}/configure \
--prefix="$PREFIX" \
--host="$BUILDCHAIN" \
--enable-static \
--disable-shared \
--disable-readline \
--disable-dynamic-extensions
# running make tries to build the command line executable which fails
# so let's hack around that
make libsqlite3.la
touch sqlite3
make install-libLTLIBRARIES install-pkgconfigDATA
popd
fi
if [ ! -d libxml2 ] ; then
git clone https://github.com/GNOME/libxml2.git libxml2
fi