From b49751e7febd262b754043e4e523e6690bfbbfaa Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 22 Dec 2015 09:04:54 +0800 Subject: bind: 9.10.2-P4 -> 9.10.3-P2 Upgrade bind from 9.10.2-P4 to 9.10.3-P2. * update context of 0001-build-use-pkg-config-to-find-libxml2.patch * add PACKAGECONFIGs readline and libedit. They provide same library, so should not be set at same time. Signed-off-by: Kai Kang Signed-off-by: Ross Burton --- .../0001-build-use-pkg-config-to-find-libxml2.patch | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'meta/recipes-connectivity/bind/bind') 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 index cb5251d159..805cbb3315 100644 --- 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 @@ -4,15 +4,18 @@ libxml2. Upstream-Status: Inappropriate Signed-off-by: Ross Burton +Update context for version 9.10.3-P2. + +Signed-off-by: Kai Kang --- - configure.in | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) + configure.in | 23 +++-------------------- + 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/configure.in b/configure.in -index d566e1c..c9ef3a6 100644 +index 0db826d..75819eb 100644 --- a/configure.in +++ b/configure.in -@@ -2102,21 +2102,9 @@ case "$use_libxml2" in +@@ -2107,26 +2107,9 @@ case "$use_libxml2" in DST_LIBXML2_INC="" ;; auto|yes) @@ -22,8 +25,13 @@ index d566e1c..c9ef3a6 100644 - libxml2_cflags=`xml2-config --cflags` - ;; - *) -- libxml2_libs= -- libxml2_cflags= +- if test "$use_libxml2" = "yes" ; then +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(required libxml2 version not available) +- else +- libxml2_libs= +- libxml2_cflags= +- fi - ;; - esac - ;; -- cgit 1.2.3-korg