diff options
Diffstat (limited to 'meta/recipes-connectivity/bind/bind')
-rw-r--r-- | meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch | 42 | ||||
-rw-r--r-- | meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch | 35 |
2 files changed, 42 insertions, 35 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 | |||
diff --git a/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch b/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch deleted file mode 100644 index d24276cf9e..0000000000 --- a/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 8fa549fe5390875d56f75e20d364394cd5ccf388 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe MacDonald <joe_macdonald@mentor.com> | ||
3 | Date: Mon, 3 Nov 2014 21:52:02 -0500 | ||
4 | Subject: [PATCH] bind: add crosscripts search path for xml2-config | ||
5 | |||
6 | The configure script was testing xml2-config from bin but in openembedded | ||
7 | bin folder is not copied to sysroot so the test was failing. Added another | ||
8 | condition to test libxml-2.0.pc which is present in lib folder. Used pkg-config | ||
9 | to get libs and cflags information. | ||
10 | |||
11 | Upstream-Status: Inappropriate [ openembedded specific ] | ||
12 | |||
13 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> | ||
14 | Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> | ||
15 | --- | ||
16 | configure.in | 3 +++ | ||
17 | 1 file changed, 3 insertions(+) | ||
18 | |||
19 | diff --git a/configure.in b/configure.in | ||
20 | index 3d04f4c..6032f67 100644 | ||
21 | --- a/configure.in | ||
22 | +++ b/configure.in | ||
23 | @@ -1433,6 +1433,9 @@ case "$use_libxml2" in | ||
24 | if test -f "$use_libxml2/bin/xml2-config" ; then | ||
25 | libxml2_libs=`$use_libxml2/bin/xml2-config --libs` | ||
26 | libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags` | ||
27 | + elif test -f "$use_libxml2/$base_libdir/pkgconfig/libxml-2.0.pc" ; then | ||
28 | + libxml2_libs=`pkg-config libxml-2.0 --libs` | ||
29 | + libxml2_cflags=`pkg-config libxml-2.0 --cflags` | ||
30 | fi | ||
31 | ;; | ||
32 | esac | ||
33 | -- | ||
34 | 1.9.1 | ||
35 | |||