From 2934320f43a542fed05746ace76928756d32c2ab Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 19 Jul 2016 18:52:12 -0400 Subject: [PATCH] libxslt: Fix xslt-config invocation of xml2-config Fixes #360. --- packages/libxslt/build.sh | 2 ++ packages/libxslt/xslt-config.in.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 packages/libxslt/xslt-config.in.patch diff --git a/packages/libxslt/build.sh b/packages/libxslt/build.sh index 985637ab1..8541c769a 100644 --- a/packages/libxslt/build.sh +++ b/packages/libxslt/build.sh @@ -1,7 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://xmlsoft.org/libxslt/ TERMUX_PKG_DESCRIPTION="XSLT processing library" TERMUX_PKG_VERSION=1.1.29 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxslt/libxslt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python" TERMUX_PKG_DEPENDS="libxml2,libgcrypt" +TERMUX_PKG_DEVPACKAGE_DEPENDS="libxml2-dev" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xslt-config lib/xsltConf.sh" diff --git a/packages/libxslt/xslt-config.in.patch b/packages/libxslt/xslt-config.in.patch new file mode 100644 index 000000000..cf955e8a9 --- /dev/null +++ b/packages/libxslt/xslt-config.in.patch @@ -0,0 +1,15 @@ +diff -u -r ../libxslt-1.1.29/xslt-config.in ./xslt-config.in +--- ../libxslt-1.1.29/xslt-config.in 2015-05-10 10:11:30.000000000 -0400 ++++ ./xslt-config.in 2016-07-19 08:16:16.959043088 -0400 +@@ -89,9 +89,9 @@ + shift + done + +-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" ++the_libs="@XSLT_LIBS@ @EXTRA_LIBS@" + if test "$includedir" != "/usr/include"; then +- the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" ++ the_flags="$the_flags -I$includedir `@TERMUX_PREFIX@/bin/xml2-config --cflags`" + else + the_flags="$the_flags `@XML_CONFIG@ --cflags`" + fi