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: add libxml2 build

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2020-04-02 09:36:44 -07:00
parent d5e6a65944
commit 5178ea2d15
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packaging/ios/build.sh
View file

@ -137,10 +137,24 @@ for ARCH in $ARCHS; do
export OSX_PLATFORM=$(xcrun --sdk macosx --show-sdk-platform-path) export OSX_PLATFORM=$(xcrun --sdk macosx --show-sdk-platform-path)
export OSX_SDK=$(xcrun --sdk macosx --show-sdk-path) export OSX_SDK=$(xcrun --sdk macosx --show-sdk-path)
target=$ARCH # build libxml2 and libxslt
hosttarget=$ARCH 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 pushd ${PARENT_DIR}/libxslt
autoreconf --install autoreconf --install
popd popd

2
scripts/get-dep-lib.sh
View file

@ -119,7 +119,7 @@ case ${PLATFORM} in
PACKAGES=("${COMMON_PACKAGES[@]}" hidapi libcurl libusb openssl libssh2) PACKAGES=("${COMMON_PACKAGES[@]}" hidapi libcurl libusb openssl libssh2)
;; ;;
ios) ios)
PACKAGES=("${COMMON_PACKAGES[@]}" libxslt) PACKAGES=("${COMMON_PACKAGES[@]}" libxml2 libxslt)
;; ;;
android) android)
PACKAGES=("${COMMON_PACKAGES[@]}" libxslt sqlite libxml2 openssl libftdi1 libusb) PACKAGES=("${COMMON_PACKAGES[@]}" libxslt sqlite libxml2 openssl libftdi1 libusb)