summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2017-11-08 12:58:41 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-11 12:14:28 +0000
commit0cff8d3c5bd2cddc9a0962257d64eba1efb4b17c (patch)
tree081c38c185da49b9cfe284fd1d7a881bcbfb9a5f /meta
parentff04a94d15671bb5da4e6471eab13697f28c5e30 (diff)
downloadpoky-0cff8d3c5bd2cddc9a0962257d64eba1efb4b17c.tar.gz
dhcp: fix build issue with libxml2 support
A missing case breaks the build when libxml2 is required and found appropriately. The third argument to the function AC_SEARCH_LIB is action-if-found which was mistakenly been used for the case where the library is not found and hence breaks the configure phase where it shoud actually pass. We now pass on silently when action-if-found is executed. (From OE-Core rev: a17f3ec910366e9e7551fa24fbc07929b9584341) Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch37
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb1
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch b/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
new file mode 100644
index 0000000000..2d3af9db0b
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
@@ -0,0 +1,37 @@
1From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00 2001
2From: Awais Belal <awais_belal@mentor.com>
3Date: Wed, 25 Oct 2017 21:00:05 +0500
4Subject: [PATCH] dhcp: correct the intention for xml2 lib search
5
6A missing case breaks the build when libxml2 is
7required and found appropriately. The third argument
8to the function AC_SEARCH_LIB is action-if-found which
9was mistakenly been used for the case where the library
10is not found and hence breaks the configure phase
11where it shoud actually pass.
12We now pass on silently when action-if-found is
13executed.
14
15Upstream-Status: Pending
16
17Signed-off-by: Awais Belal <awais_belal@mentor.com>
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index bfe988a..f0459e6 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -608,7 +608,7 @@ AC_ARG_WITH(libxml2,
27 with_libxml2="$withval", with_libxml2="no")
28
29 if test x$with_libxml2 != xno; then
30- AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
31+ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
32 [if test x$with_libxml2 != xauto; then
33 AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
34 fi])
35--
362.11.1
37
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
index 4634a01b04..6615ae2555 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
@@ -11,6 +11,7 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat
11 file://0009-remove-dhclient-script-bash-dependency.patch \ 11 file://0009-remove-dhclient-script-bash-dependency.patch \
12 file://0010-build-shared-libs.patch \ 12 file://0010-build-shared-libs.patch \
13 file://0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch \ 13 file://0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch \
14 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
14 " 15 "
15 16
16SRC_URI[md5sum] = "afa6e9b3eb7539ea048421a82c668adc" 17SRC_URI[md5sum] = "afa6e9b3eb7539ea048421a82c668adc"