Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 1 | From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| 3 | Date: Tue, 9 Jun 2015 11:22:00 -0400 |
| 4 | Subject: [PATCH] bind: ensure searching for json headers searches sysroot |
| 5 | |
| 6 | Bind can fail configure by detecting headers w/o libs[1], or |
| 7 | it can fail the host contamination check as per below: |
| 8 | |
| 9 | ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. |
| 10 | Rerun configure task after fixing this. The path was 'build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/build' |
| 11 | ERROR: Function failed: do_qa_configure |
| 12 | ERROR: Logfile of failure stored in: build/tmp/work/core2-64-poky-linux/bind/9.10.2-r1/temp/log.do_configure.5242 |
| 13 | ERROR: Task 5 (meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure) failed with exit code '1' |
| 14 | NOTE: Tasks Summary: Attempted 773 tasks of which 768 didn't need to be rerun and 1 failed. |
| 15 | No currently running tasks (773 of 781) |
| 16 | |
| 17 | Summary: 1 task failed: |
| 18 | /meta/recipes-connectivity/bind/bind_9.10.2.bb, do_configure |
| 19 | |
| 20 | One way to fix it would be to unconditionally disable json in bind |
| 21 | configure[2] but here we fix it by using the path to where we would |
| 22 | put the header if we had json in the sysroot, in case someone wants |
| 23 | to 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 | |
| 28 | Upstream-Status: Inappropriate [OE Specific] |
| 29 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 30 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 31 | --- |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 32 | configure.ac | 2 +- |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 33 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 34 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 35 | diff --git a/configure.ac b/configure.ac |
| 36 | index 17392fd..e85a5c6 100644 |
| 37 | --- a/configure.ac |
| 38 | +++ b/configure.ac |
| 39 | @@ -2449,7 +2449,7 @@ case "$use_libjson" in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 40 | libjson_libs="" |
| 41 | ;; |
| 42 | auto|yes) |
| 43 | - for d in /usr /usr/local /opt/local |
| 44 | + for d in "${STAGING_INCDIR}" |
| 45 | do |
| 46 | if test -f "${d}/include/json/json.h" |
| 47 | then |