summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-04-02 12:04:11 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-04-04 11:09:17 -0700
commit0d8324bfb43ea405b57340e910b05b88e364afaa (patch)
tree31bfcb226713addfca16d014bc450c3014bb83a9 /packaging
parent6c5c2bfb186edc8f3417c99d7f743e3f2da149a3 (diff)
downloadsubsurface-0d8324bfb43ea405b57340e910b05b88e364afaa.tar.gz
iOS: fix libxslt build
We need to build libxml2 without LZMA. We need to make sure that libxslt finds the libxml2 includes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/ios/build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh
index c80e95334..658e117e6 100755
--- a/packaging/ios/build.sh
+++ b/packaging/ios/build.sh
@@ -146,7 +146,7 @@ for ARCH in $ARCHS; do
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
+ "$PARENT_DIR"/libxml2/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --without-lzma --without-python --without-iconv --enable-static --disable-shared
perl -pi -e 's/runtest\$\(EXEEXT\)//' Makefile
perl -pi -e 's/testrecurse\$\(EXEEXT\)//' Makefile
make
@@ -161,7 +161,7 @@ for ARCH in $ARCHS; do
if [ ! -e "$PKG_CONFIG_LIBDIR"/libxslt.pc ] ; then
mkdir -p "$PARENT_DIR"/libxslt-build-$ARCH
pushd "$PARENT_DIR"/libxslt-build-$ARCH
- "$PARENT_DIR"/libxslt/configure --host=$BUILDCHAIN --prefix="$PREFIX" --without-python --without-crypto --enable-static --disable-shared
+ "$PARENT_DIR"/libxslt/configure --host=$BUILDCHAIN --prefix="$PREFIX" --with-libxml-include-prefix="$INSTALL_ROOT"/include/libxml2 --without-python --without-crypto --enable-static --disable-shared
make
make install
popd