summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-06-09 12:13:51 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:16 +0100
commit6119f30d83aa3cce977186fed0732cbdef44035c (patch)
treeafccdb20ab5392fb73408760bfaa1a20381ebf4f /meta
parent62136c0e819fb2cb90b44d5f1029b8b09f287300 (diff)
downloadpoky-6119f30d83aa3cce977186fed0732cbdef44035c.tar.gz
bind: ensure searching for json headers searches sysroot
Bind can fail configure by detecting headers w/o libs, or it can fail the host contamination check. More details are within the commit log in the contained patch. (From OE-Core rev: 6fa5671c5cf8e5e88c5ad1e39742d59453e02695) Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.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/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch49
-rw-r--r--meta/recipes-connectivity/bind/bind_9.10.2.bb1
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
new file mode 100644
index 0000000000..dedc437507
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
@@ -0,0 +1,49 @@
1From 9473d29843579802e96b0293a3e953fed93de82c Mon Sep 17 00:00:00 2001
2From: Paul Gortmaker <paul.gortmaker@windriver.com>
3Date: Tue, 9 Jun 2015 11:22:00 -0400
4Subject: [PATCH] bind: ensure searching for json headers searches sysroot
5
6Bind can fail configure by detecting headers w/o libs[1], or
7it can fail the host contamination check as per below:
8
9ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
10Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build'
11ERROR: Function failed: do_qa_configure
12ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242
13ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1'
14NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed.
15No currently running tasks (773 of 781)
16
17Summary: 1 task failed:
18 /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure
19
20One way to fix it would be to unconditionally disable json in bind
21configure[2] but here we fix it by using the path to where we would
22put the header if we had json in the sysroot, in case someone wants
23to make use of the combination some day.
24
25[1] https://trac.macports.org/ticket/45305
26[2] https://trac.macports.org/changeset/126406
27
28Upstream-status: Inappropriate [OE Specific]
29Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
30---
31 configure.in | 2 +-
32 1 file changed, 1 insertion(+), 1 deletion(-)
33
34diff --git a/configure.in b/configure.in
35index c9ef3a601343..17a1f613e9ac 100644
36--- a/configure.in
37+++ b/configure.in
38@@ -2139,7 +2139,7 @@ case "$use_libjson" in
39 libjson_libs=""
40 ;;
41 auto|yes)
42- for d in /usr /usr/local /opt/local
43+ for d in "${STAGING_INCDIR}"
44 do
45 if test -f "${d}/include/json/json.h"
46 then
47--
482.4.2
49
diff --git a/meta/recipes-connectivity/bind/bind_9.10.2.bb b/meta/recipes-connectivity/bind/bind_9.10.2.bb
index 1dc15a9da7..43f17984b5 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.2.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.2.bb
@@ -18,6 +18,7 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
18 file://init.d-add-support-for-read-only-rootfs.patch \ 18 file://init.d-add-support-for-read-only-rootfs.patch \
19 file://bind-confgen-build-unix.o-once.patch \ 19 file://bind-confgen-build-unix.o-once.patch \
20 file://0001-build-use-pkg-config-to-find-libxml2.patch \ 20 file://0001-build-use-pkg-config-to-find-libxml2.patch \
21 file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
21 " 22 "
22 23
23SRC_URI[md5sum] = "dca7a9967947bffa98547fca6130fc04" 24SRC_URI[md5sum] = "dca7a9967947bffa98547fca6130fc04"