diff options
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp.inc | 3 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index a673dbc878..9c4233b19d 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc | |||
@@ -18,7 +18,8 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ | |||
18 | file://init-server file://default-server \ | 18 | file://init-server file://default-server \ |
19 | file://dhclient.conf file://dhcpd.conf \ | 19 | file://dhclient.conf file://dhcpd.conf \ |
20 | file://dhcpd.service file://dhcrelay.service \ | 20 | file://dhcpd.service file://dhcrelay.service \ |
21 | file://dhcpd6.service " | 21 | file://dhcpd6.service \ |
22 | file://search-for-libxml2.patch " | ||
22 | 23 | ||
23 | UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/" | 24 | UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/" |
24 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" | 25 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" |
diff --git a/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch b/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch new file mode 100644 index 0000000000..a08a5b725f --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | libdns requires libxml2 if bind was built with libxml2 support | ||
2 | enabled. Compilation will fail for omapip/test.c in case | ||
3 | lxml2 isn't used during the build. So, we add losely coupled | ||
4 | search path which will pick up the lib if it is present. | ||
5 | |||
6 | Signed-off-by: Awais Belal <awais_belal@mentor.com> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | diff --git a/configure.ac b/configure.ac | ||
10 | index c9dc8b5..85f59be 100644 | ||
11 | --- a/configure.ac | ||
12 | +++ b/configure.ac | ||
13 | @@ -602,6 +602,10 @@ no) | ||
14 | esac | ||
15 | AC_SUBST([libbind]) | ||
16 | |||
17 | +# We need to find libxml2 if bind was built with support enabled | ||
18 | +# otherwise we'll fail to build omapip/test.c | ||
19 | +AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],) | ||
20 | + | ||
21 | # OpenLDAP support. | ||
22 | AC_ARG_WITH(ldap, | ||
23 | AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]), | ||