diff options
author | Ross Burton <ross.burton@intel.com> | 2015-05-07 15:30:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-09 22:26:43 +0100 |
commit | 4b042c244766f74453c5d544be55c3ecc73a3ab0 (patch) | |
tree | 3e3c761526d4c386896ada1a7162a6eba9b8339d /meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch | |
parent | 05956671a250e7664593e136d1d60cc2df36e245 (diff) | |
download | poky-4b042c244766f74453c5d544be55c3ecc73a3ab0.tar.gz |
bind: update libxml2 detection patch
Refresh the libxml2 detection patch to directly call pkg-config instead of
attempting to use xml2-config, which will always return an error in OE.
(From OE-Core rev: 76c53feaec1b8c1045aaf2a78a9225a732a37f1f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch')
-rw-r--r-- | meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch b/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch new file mode 100644 index 0000000000..cb5251d159 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | xml2-config is disabled, so change the configure script to use pkgconfig to find | ||
2 | libxml2. | ||
3 | |||
4 | Upstream-Status: Inappropriate | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | --- | ||
8 | configure.in | 18 +++--------------- | ||
9 | 1 file changed, 3 insertions(+), 15 deletions(-) | ||
10 | |||
11 | diff --git a/configure.in b/configure.in | ||
12 | index d566e1c..c9ef3a6 100644 | ||
13 | --- a/configure.in | ||
14 | +++ b/configure.in | ||
15 | @@ -2102,21 +2102,9 @@ case "$use_libxml2" in | ||
16 | DST_LIBXML2_INC="" | ||
17 | ;; | ||
18 | auto|yes) | ||
19 | - case X`(xml2-config --version) 2>/dev/null` in | ||
20 | - X2.[[6789]].*) | ||
21 | - libxml2_libs=`xml2-config --libs` | ||
22 | - libxml2_cflags=`xml2-config --cflags` | ||
23 | - ;; | ||
24 | - *) | ||
25 | - libxml2_libs= | ||
26 | - libxml2_cflags= | ||
27 | - ;; | ||
28 | - esac | ||
29 | - ;; | ||
30 | - *) | ||
31 | - if test -f "$use_libxml2/bin/xml2-config" ; then | ||
32 | - libxml2_libs=`$use_libxml2/bin/xml2-config --libs` | ||
33 | - libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags` | ||
34 | + if pkg-config --exists libxml-2.0 ; then | ||
35 | + libxml2_libs=`pkg-config libxml-2.0 --libs` | ||
36 | + libxml2_cflags=`pkg-config libxml-2.0 --cflags` | ||
37 | fi | ||
38 | ;; | ||
39 | esac | ||
40 | -- | ||
41 | 2.1.4 | ||
42 | |||