diff options
author | akuster <akuster808@gmail.com> | 2020-09-01 08:22:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:00:46 +0100 |
commit | ed0314e26e7ae4d545b513605b1ff13a7055e937 (patch) | |
tree | 956da83c3427f98987b6173cb320ce0623092db9 /meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch | |
parent | d8f211edf5320136767da87506009a700abe183d (diff) | |
download | poky-ed0314e26e7ae4d545b513605b1ff13a7055e937.tar.gz |
bind: 9.11 remove
(From OE-Core rev: 29949cd7cf3a660fb3bcf251f5127a4cdb2804ec)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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, 0 insertions, 47 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 deleted file mode 100644 index 84559e5f37..0000000000 --- a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From edda20fb5a6e88548f85e39d34d6c074306e15bc 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 17392fd..e85a5c6 100644 | ||
37 | --- a/configure.ac | ||
38 | +++ b/configure.ac | ||
39 | @@ -2449,7 +2449,7 @@ case "$use_libjson" in | ||
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 | ||