diff options
| author |  jan Iversen <jani@libreoffice.org> | 2018-05-08 18:18:23 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-05-10 20:43:22 -0700 |
| commit | 6019688b98979c04c162b06326f970e24e7e8525 (patch) | |
| tree | 002fdf16392a6f45171ee45d1b48965e20435c45 /packaging | |
| parent | 5aa5398624c8d404abdf3a4023a5a504dd3e4366 (diff) | |
| download | subsurface-6019688b98979c04c162b06326f970e24e7e8525.tar.gz | |
iOS: removed local build of libxml2
script/build.sh uses the builtin libxml2 and do not build locally,
updated build.sh and Subsurface-mobile.pro to to the same.
sadly enough xslt is not distributed for iOS so it must be built.
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 | 8 | ||||
| -rwxr-xr-x | packaging/ios/build.sh | 34 |
2 files changed, 6 insertions, 36 deletions
diff --git a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro index bfe3bab16..9d129c493 100644 --- a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro @@ -109,20 +109,20 @@ LIBS += ../install-root/lib/libdivecomputer.a \ ../install-root/lib/libgit2.a \ ../install-root/lib/libzip.a \ ../install-root/lib/libxslt.a \ - ../install-root/lib/libxml2.a \ ../googlemaps-build/libqtgeoservices_googlemaps.a \ -liconv \ - -lsqlite3 + -lsqlite3 \ + -lxml2 INCLUDEPATH += ../install-root/include/ \ ../install-root/lib/libzip/include \ - ../install-root/include/libxml2 \ ../install-root/include/libxstl \ ../install-root/include/libexstl \ ../install-root/include/openssl \ ../../.. \ ../../../core \ - ../../../mobile-widgets/qml/kirigami/src/libkirigami + ../../../mobile-widgets/qml/kirigami/src/libkirigami \ + /usr/include/libxml2 HEADERS += \ ../../../core/libdivecomputer.h \ diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index d37bd7107..2e1579759 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? -LIBXML2_VERSION=2.9.2 LIBXSLT_VERSION=1.1.28 LIBZIP_VERSION=0.11.2 LIBGIT2_VERSION=0.26.0 @@ -65,10 +64,8 @@ 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) # -# LIBXSLT and LIBXML2 are only used on this platform +# LIBXSLT 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. # set up the Subsurface versions by hand @@ -152,37 +149,10 @@ echo next building for $ARCH target=$ARCH hosttarget=$ARCH - if [ ! -d libxml2 ] ; then - git clone https://github.com/GNOME/libxml2.git libxml2 - fi - pushd libxml2 - if ! git checkout v$LIBXML2_VERSION ; then - echo "Can't find the right tag in libxml2 - giving up" - exit 1 - fi - autoreconf --install - popd - if [ ! -e $PKG_CONFIG_LIBDIR/libxml-2.0.pc ] ; then - mkdir -p libxml2-build-$ARCH - pushd libxml2-build-$ARCH - if [ "$ARCH_NAME" == "x86_64" ]; then - ../libxml2/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --without-python --without-iconv --enable-static --disable-shared - else - ../libxml2/configure --host=arm-apple-darwin --prefix=${PREFIX} --without-python --without-iconv --enable-static --disable-shared - fi - perl -pi -e 's/runtest\$\(EXEEXT\)//' Makefile - perl -pi -e 's/testrecurse\$\(EXEEXT\)//' Makefile - make - make install - - popd - fi - if [ ! -d libxslt ] ; then git clone https://github.com/GNOME/libxslt.git libxslt fi # libxslt have too old config.sub - cp libxml2/config.sub libxslt pushd libxslt if ! git checkout v$LIBXSLT_VERSION ; then echo "Can't find the right tag in libxslt - giving up" @@ -193,7 +163,7 @@ echo next building for $ARCH if [ ! -e $PKG_CONFIG_LIBDIR/libxslt.pc ] ; then mkdir -p libxslt-build-$ARCH_NAME pushd libxslt-build-$ARCH_NAME - ../libxslt/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --with-libxml-prefix=${PREFIX} --without-python --without-crypto --enable-static --disable-shared + ../libxslt/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --without-python --without-crypto --enable-static --disable-shared make make install popd |