diff options
| author |  jan Iversen <jani@libreoffice.org> | 2018-05-08 17:27:29 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-05-10 20:43:22 -0700 |
| commit | 5aa5398624c8d404abdf3a4023a5a504dd3e4366 (patch) | |
| tree | db886dc8a968e90c264870795227a8f626ffedf1 /packaging | |
| parent | a0030a488aafc74d36ce7511db9da229010ce528 (diff) | |
| download | subsurface-5aa5398624c8d404abdf3a4023a5a504dd3e4366.tar.gz | |
iOS: removed local build of sqllite3
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>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/ios/Subsurface-mobile/Subsurface-mobile.pro | 4 | ||||
| -rwxr-xr-x | packaging/ios/build.sh | 32 |
2 files changed, 4 insertions, 32 deletions
diff --git a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro index 0bcb181f3..bfe3bab16 100644 --- a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro @@ -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 \ diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index a6197fbe7..d37bd7107 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -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 |