| 1 |
mgorny 14/09/03 09:51:38 |
| 2 |
|
| 3 |
Added: libxslt-1.1.28-AC_PATH_TOOL.patch |
| 4 |
Log: |
| 5 |
Use wrapped xml2-config, bug #518728. And CHOST-ize xslt-config too while at it. |
| 6 |
|
| 7 |
(Portage version: 2.2.13_pre1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libxslt-1.1.28-AC_PATH_TOOL.patch |
| 16 |
=================================================================== |
| 17 |
From 1fc82ea63f16efc0d607b39a162e3032d7c2d602 Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 19 |
Date: Wed, 3 Sep 2014 11:21:01 +0200 |
| 20 |
Subject: [PATCH] Use AC_PATH_TOOL to find libgcrypt-config and xml2-config |
| 21 |
|
| 22 |
Using AC_PATH_TOOL prefers ${CHOST}-prefixed tools over 'bare' ones, |
| 23 |
therefore improving support for cross-compilation and multilib. This |
| 24 |
is useful for environment where libgcrypt-config and xml2-config |
| 25 |
correspond to the build host environment, while |
| 26 |
${CHOST}-libgcrypt-config and ${CHOST}-xml2-config are installed for |
| 27 |
each supported build targets. |
| 28 |
|
| 29 |
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=725635 |
| 30 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=518728 |
| 31 |
--- |
| 32 |
configure.in | 6 +++--- |
| 33 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 34 |
|
| 35 |
diff --git a/configure.in b/configure.in |
| 36 |
index a861e90..f1639a8 100644 |
| 37 |
--- a/configure.in |
| 38 |
+++ b/configure.in |
| 39 |
@@ -393,7 +393,7 @@ case $host in |
| 40 |
CRYPTO_TESTDIR=crypto |
| 41 |
;; |
| 42 |
*) |
| 43 |
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) |
| 44 |
+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) |
| 45 |
if test "$LIBGCRYPT_CONFIG" != "no" ; then |
| 46 |
LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` |
| 47 |
if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") |
| 48 |
@@ -507,9 +507,9 @@ AC_SUBST(LIBXML_REQUIRED_VERSION) |
| 49 |
AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) |
| 50 |
if test "x$LIBXML_CONFIG_PREFIX" != "x" |
| 51 |
then |
| 52 |
- XML_CONFIG=${LIBXML_CONFIG_PREFIX}/bin/xml2-config |
| 53 |
+ AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false], [${LIBXML_CONFIG_PREFIX}/bin]) |
| 54 |
else |
| 55 |
- XML_CONFIG=xml2-config |
| 56 |
+ AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false]) |
| 57 |
fi |
| 58 |
|
| 59 |
dnl |
| 60 |
-- |
| 61 |
2.1.0 |
Archives