diff options
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch | 54 |
1 files changed, 0 insertions, 54 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 deleted file mode 100644 index 1e23c0f56b..0000000000 --- a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
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 | Update context for version 9.10.3-P2. | ||
8 | |||
9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
10 | |||
11 | Update context for version 9.10.5-P3. | ||
12 | |||
13 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
14 | --- | ||
15 | configure.in | 23 +++-------------------- | ||
16 | 1 file changed, 3 insertions(+), 20 deletions(-) | ||
17 | |||
18 | diff --git a/configure.in b/configure.in | ||
19 | index 4da73a4..6f2a754 100644 | ||
20 | --- a/configure.in | ||
21 | +++ b/configure.in | ||
22 | @@ -2282,26 +2282,9 @@ case "$use_libxml2" in | ||
23 | DST_LIBXML2_INC="" | ||
24 | ;; | ||
25 | auto|yes) | ||
26 | - case X`(xml2-config --version) 2>/dev/null` in | ||
27 | - X2.[[6789]].*) | ||
28 | - libxml2_libs=`xml2-config --libs` | ||
29 | - libxml2_cflags=`xml2-config --cflags` | ||
30 | - ;; | ||
31 | - *) | ||
32 | - if test "yes" = "$use_libxml2" ; then | ||
33 | - AC_MSG_RESULT(no) | ||
34 | - AC_MSG_ERROR(required libxml2 version not available) | ||
35 | - else | ||
36 | - libxml2_libs= | ||
37 | - libxml2_cflags= | ||
38 | - fi | ||
39 | - ;; | ||
40 | - esac | ||
41 | - ;; | ||
42 | - *) | ||
43 | - if test -f "$use_libxml2/bin/xml2-config" ; then | ||
44 | - libxml2_libs=`$use_libxml2/bin/xml2-config --libs` | ||
45 | - libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags` | ||
46 | + if pkg-config --exists libxml-2.0 ; then | ||
47 | + libxml2_libs=`pkg-config libxml-2.0 --libs` | ||
48 | + libxml2_cflags=`pkg-config libxml-2.0 --cflags` | ||
49 | fi | ||
50 | ;; | ||
51 | esac | ||
52 | -- | ||
53 | 2.1.4 | ||
54 | |||