[OE-core] [PATCH 2/2] dhcp: fix a building failure when upgrade bind

[rongqing.li at windriver.com]

From: Roy Li <rongqing.li at windriver.com>

The libdns.a and libisc.a from bind-9.10.2 maybe need the libxml2,
so add PKGCONFIG to make libxml2 dependence deterministic.

Signed-off-by: Roy Li <rongqing.li at windriver.com>
---
 meta/recipes-connectivity/dhcp/dhcp.inc            |  7 ++++-
 .../dhcp/dhcp/0001-search-libxml2.patch            | 35 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-search-libxml2.patch

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 6ced775..ed2849f 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -17,7 +17,9 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
            file://init-relay file://default-relay \
            file://init-server file://default-server \
            file://dhclient.conf file://dhcpd.conf \
-           file://dhcpd.service file://dhcrelay.service"
+           file://dhcpd.service file://dhcrelay.service \
+           file://0001-search-libxml2.patch \
+"
 
 inherit autotools systemd
 
@@ -36,6 +38,9 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
                 --with-libbind=${STAGING_LIBDIR}/ \
                "
 
+PACKAGECONFIG ?= "libxml2"
+PACKAGECONFIG[libxml2] = "--with-libxml2=yes,--with-libxml2=no,libxml2"
+
 do_install_append () {
 	install -d ${D}${sysconfdir}/init.d
 	install -d ${D}${sysconfdir}/default
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-search-libxml2.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-search-libxml2.patch
new file mode 100644
index 0000000..27f0f7b
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0001-search-libxml2.patch
@@ -0,0 +1,35 @@
+[PATCH] search libxml2
+
+Upstream-Status: Pending
+
+The libdns.a and libisc.a from bind-9.10.2 maybe need libxml2
+
+Signed-off-by: Roy Li <rongqing.li at windriver.com>
+---
+ configure.ac | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index c9dc8b5..55ea877 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -602,6 +602,16 @@ no)
+ esac
+ AC_SUBST([libbind])
+ 
++# XML support.
++AC_ARG_WITH(libxml2,
++    AS_HELP_STRING([--with-libxml2],[enable XML2 support (default is no)]),
++    [libxml2=$withval],
++    [libxml2=no])
++
++if test x$libxml2 = xyes ; then
++    AC_SEARCH_LIBS(xmlTextWriterEndElement, [xml2],)
++fi
++
+ # OpenLDAP support.
+ AC_ARG_WITH(ldap,
+     AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]),
+-- 
+1.9.1
+
-- 
1.9.1