mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android/iOS build: get libxml2 and libxslt from GitHub

Browse source 
The xmlsoft.org links sometimes time out. Sadly, GitHub API gives us an
oddly named top level directory in the tar file, so lets strip that and
replace it with the "usual" name.

Also, for the "raw" tar files from GitHub we need to run autoreconf
ourselves.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-03-19 09:49:13 -07:00
parent 01e4ec47be
commit 6c3cd24ef8
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packaging/android/build.sh
View file

@ -204,10 +204,14 @@ if [ ! -e "$PKG_CONFIG_LIBDIR/sqlite3.pc" ] ; then
fi fi
if [ ! -e libxml2-${LIBXML2_VERSION}.tar.gz ] ; then if [ ! -e libxml2-${LIBXML2_VERSION}.tar.gz ] ; then
wget ftp://xmlsoft.org/libxml2/libxml2-${LIBXML2_VERSION}.tar.gz wget http://api.github.com/repos/GNOME/libxml2/tarball/v${LIBXML2_VERSION} -O libxml2-${LIBXML2_VERSION}.tar.gz
fi fi
if [ ! -e libxml2-${LIBXML2_VERSION} ] ; then if [ ! -e libxml2-${LIBXML2_VERSION} ] ; then
tar -zxf libxml2-${LIBXML2_VERSION}.tar.gz mkdir -p libxml2-${LIBXML2_VERSION}
tar -xzf libxml2-${LIBXML2_VERSION}.tar.gz --strip 1 -C libxml2-${LIBXML2_VERSION}
pushd libxml2-${LIBXML2_VERSION}
autoreconf --install
popd
fi fi
if [ ! -e "$PKG_CONFIG_LIBDIR/libxml-2.0.pc" ] ; then if [ ! -e "$PKG_CONFIG_LIBDIR/libxml-2.0.pc" ] ; then
mkdir -p libxml2-build-"$ARCH" mkdir -p libxml2-build-"$ARCH"
@ -221,12 +225,14 @@ if [ ! -e "$PKG_CONFIG_LIBDIR/libxml-2.0.pc" ] ; then
fi fi
if [ ! -e libxslt-${LIBXSLT_VERSION}.tar.gz ] ; then if [ ! -e libxslt-${LIBXSLT_VERSION}.tar.gz ] ; then
wget ftp://xmlsoft.org/libxml2/libxslt-${LIBXSLT_VERSION}.tar.gz wget http://api.github.com/repos/GNOME/libxslt/tarball/v${LIBXSLT_VERSION} -O libxslt-${LIBXSLT_VERSION}.tar.gz
fi fi
if [ ! -e libxslt-${LIBXSLT_VERSION} ] ; then if [ ! -e libxslt-${LIBXSLT_VERSION} ] ; then
tar -zxf libxslt-${LIBXSLT_VERSION}.tar.gz mkdir -p libxslt-${LIBXSLT_VERSION}
# libxslt have too old config.sub for android tar -zxf libxslt-${LIBXSLT_VERSION}.tar.gz --strip 1 -C libxslt-${LIBXSLT_VERSION}
cp libxml2-${LIBXML2_VERSION}/config.sub libxslt-${LIBXSLT_VERSION} pushd libxslt-${LIBXSLT_VERSION}
autoreconf --install
popd
fi fi
if [ ! -e "$PKG_CONFIG_LIBDIR/libxslt.pc" ] ; then if [ ! -e "$PKG_CONFIG_LIBDIR/libxslt.pc" ] ; then
mkdir -p libxslt-build-"$ARCH" mkdir -p libxslt-build-"$ARCH"

10
packaging/ios/build.sh
View file

@ -130,9 +130,11 @@ echo next building for $ARCH
fi fi
if [ ! -e libxml2-${LIBXML2_VERSION}.tar.gz ] ; then if [ ! -e libxml2-${LIBXML2_VERSION}.tar.gz ] ; then
wget ftp://xmlsoft.org/libxml2/libxml2-${LIBXML2_VERSION}.tar.gz # wget ftp://xmlsoft.org/libxml2/libxml2-${LIBXML2_VERSION}.tar.gz
wget http://api.github.com/repos/GNOME/libxml2/tarball/v${LIBXML2_VERSION} -O libxml2-${LIBXML2_VERSION}.tar.gz
fi fi
if [ ! -e libxml2-${LIBXML2_VERSION} ] ; then if [ ! -e libxml2-${LIBXML2_VERSION} ] ; then
tar -zxf libxml2-${LIBXML2_VERSION}.tar.gz --strip 1 -C libxml2-${LIBXML2_VERSION}
tar -zxf libxml2-${LIBXML2_VERSION}.tar.gz tar -zxf libxml2-${LIBXML2_VERSION}.tar.gz
fi fi
if [ ! -e $PKG_CONFIG_LIBDIR/libxml-2.0.pc ] ; then if [ ! -e $PKG_CONFIG_LIBDIR/libxml-2.0.pc ] ; then
@ -151,10 +153,12 @@ echo next building for $ARCH
fi fi
if [ ! -e libxslt-${LIBXSLT_VERSION}.tar.gz ] ; then if [ ! -e libxslt-${LIBXSLT_VERSION}.tar.gz ] ; then
wget ftp://xmlsoft.org/libxml2/libxslt-${LIBXSLT_VERSION}.tar.gz # wget ftp://xmlsoft.org/libxml2/libxslt-${LIBXSLT_VERSION}.tar.gz
wget http://api.github.com/repos/GNOME/libxslt/tarball/v${LIBXSLT_VERSION} -O libxslt-${LIBXSLT_VERSION}.tar.gz
fi fi
if [ ! -e libxslt-${LIBXSLT_VERSION} ] ; then if [ ! -e libxslt-${LIBXSLT_VERSION} ] ; then
tar -zxf libxslt-${LIBXSLT_VERSION}.tar.gz mkdir -p libxslt-${LIBXSLT_VERSION}
tar -zxf libxslt-${LIBXSLT_VERSION}.tar.gz --strip 1 -C libxslt-${LIBXSLT_VERSION}
# libxslt have too old config.sub # libxslt have too old config.sub
cp libxml2-${LIBXML2_VERSION}/config.sub libxslt-${LIBXSLT_VERSION} cp libxml2-${LIBXML2_VERSION}/config.sub libxslt-${LIBXSLT_VERSION}
fi fi