blob: f9cdc7ca4dffaa6d2225df3b7e14b28203d718f0 [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001
Patrick Williamsc124f4f2015-09-15 14:41:29 -05002From: 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>
Andrew Geissler82c905d2020-04-13 13:39:40 -050030
Patrick Williamsc124f4f2015-09-15 14:41:29 -050031---
Andrew Geissler82c905d2020-04-13 13:39:40 -050032 configure.ac | 2 +-
Patrick Williamsc124f4f2015-09-15 14:41:29 -050033 1 file changed, 1 insertion(+), 1 deletion(-)
34
Andrew Geisslerc9f78652020-09-18 14:11:35 -050035Index: bind-9.16.4/configure.ac
36===================================================================
37--- bind-9.16.4.orig/configure.ac
38+++ bind-9.16.4/configure.ac
39@@ -1232,7 +1232,7 @@ case "$use_lmdb" in
40 LMDB_LIBS=""
Patrick Williamsc124f4f2015-09-15 14:41:29 -050041 ;;
42 auto|yes)
43- for d in /usr /usr/local /opt/local
44+ for d in "${STAGING_INCDIR}"
45 do
Andrew Geisslerc9f78652020-09-18 14:11:35 -050046 if test -f "${d}/include/lmdb.h"
Patrick Williamsc124f4f2015-09-15 14:41:29 -050047 then