diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-04-02 09:36:44 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-04-04 11:09:17 -0700 |
| commit | 5178ea2d15879e0248b91d2db20f9708b582a77b (patch) | |
| tree | 354a0883f69fc45fc109351396b6cc0c21d70b70 | |
| parent | d5e6a6594479b50a8d0f0d400e0c2dd3b8247db4 (diff) | |
| download | subsurface-5178ea2d15879e0248b91d2db20f9708b582a77b.tar.gz | |
iOS: add libxml2 build
I don't know why this is suddenly needed and wasn't before, but hopefully
this fixes the broken builds on GitHub.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/ios/build.sh | 20 | ||||
| -rwxr-xr-x | scripts/get-dep-lib.sh | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index b57d879f5..df03caf62 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -137,10 +137,24 @@ for ARCH in $ARCHS; do export OSX_PLATFORM=$(xcrun --sdk macosx --show-sdk-platform-path) export OSX_SDK=$(xcrun --sdk macosx --show-sdk-path) - target=$ARCH - hosttarget=$ARCH + # build libxml2 and libxslt + if [ ! -e "$PKG_CONFIG_LIBDIR"/libxml-2.0.pc ] ; then + if [ ! -e "$PARENT_DIR"/libxml2/configure ] ; then + pushd "$PARENT_DIR"/libxml2 + autoreconf --install + popd + fi + mkdir -p "$PARENT_DIR"/libxml2-build-"$ARCH" + pushd "$PARENT_DIR"/libxml2-build-"$ARCH" + "$PARENT_DIR"/libxml2/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --without-python --without-iconv --enable-static --disable-shared + perl -pi -e 's/runtest\$\(EXEEXT\)//' Makefile + perl -pi -e 's/testrecurse\$\(EXEEXT\)//' Makefile + make + make install + popd + fi - # libxslt have too old config.sub + # the config.sub in libxslt is too old pushd ${PARENT_DIR}/libxslt autoreconf --install popd diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index 05cb1e81c..1ff865e6c 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -119,7 +119,7 @@ case ${PLATFORM} in PACKAGES=("${COMMON_PACKAGES[@]}" hidapi libcurl libusb openssl libssh2) ;; ios) - PACKAGES=("${COMMON_PACKAGES[@]}" libxslt) + PACKAGES=("${COMMON_PACKAGES[@]}" libxml2 libxslt) ;; android) PACKAGES=("${COMMON_PACKAGES[@]}" libxslt sqlite libxml2 openssl libftdi1 libusb) |