diff options
Diffstat (limited to 'meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch')
-rw-r--r-- | meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch | 47 |
1 files changed, 47 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..38d07cae39 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 5ae30329f168c1e8d2e0c3831988a4f3e9096e39 Mon Sep 17 00:00:00 2001 | ||
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> | ||
30 | |||
31 | --- | ||
32 | configure.ac | 2 +- | ||
33 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
34 | |||
35 | diff --git a/configure.ac b/configure.ac | ||
36 | index 2ab8ddd..92fe983 100644 | ||
37 | --- a/configure.ac | ||
38 | +++ b/configure.ac | ||
39 | @@ -761,7 +761,7 @@ AS_CASE([$with_lmdb], | ||
40 | [no],[], | ||
41 | [auto|yes], [PKG_CHECK_MODULES([LMDB], [lmdb], | ||
42 | [ac_lib_lmdb_found=yes], | ||
43 | - [for ac_lib_lmdb_path in /usr /usr/local /opt /opt/local; do | ||
44 | + [for ac_lib_lmdb_path in "${STAGING_INCDIR}"; do | ||
45 | AX_LIB_LMDB([$ac_lib_lmdb_path], | ||
46 | [ac_lib_lmdb_found=yes | ||
47 | break]) | ||