diff options
author | Anatol Belski <anbelski@linux.microsoft.com> | 2021-08-11 14:39:43 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2021-08-15 07:14:07 -0700 |
commit | b472160c77dcfdf46e4d4eca69428b971238f4a9 (patch) | |
tree | 71136a1533d6d5c804c4e50657e2d2ce433a7509 | |
parent | e4a74a0f0fae82d8ebb4e5233c391eee7c899318 (diff) | |
download | meta-openembedded-b472160c77dcfdf46e4d4eca69428b971238f4a9.tar.gz |
backport: xmlsec1: Fix configure QA error caused by host lookup path
The configure script contains hardcoded lookup paths to /usr and other
paths that might interfere with the host. These are overwritten with the
staging dir locations for Poky compatibility.
Backport from meta-oe master rev. 74b66d1911118bac53033f77ba6d3923f4809d5a
Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de>
-rw-r--r-- | meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch | 22 | ||||
-rw-r--r-- | meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch new file mode 100644 index 000000000..a5a298af0 --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | xmlsec1: Fix configure QA error caused by host lookup path | ||
2 | |||
3 | ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. | ||
4 | |||
5 | It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host. | ||
6 | |||
7 | Upstream-Status: Inappropriate [embedded specific] | ||
8 | Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com> | ||
9 | |||
10 | --- a/configure.ac.orig 2021-01-13 14:37:42.254991177 +0000 | ||
11 | +++ b/configure.ac 2021-01-13 14:40:56.546269330 +0000 | ||
12 | @@ -250,8 +250,8 @@ | ||
13 | dnl ========================================================================== | ||
14 | dnl Common installation locations | ||
15 | dnl ========================================================================== | ||
16 | -COMMON_INCLUDE_DIR="/usr/include /usr/local/include" | ||
17 | -COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib" | ||
18 | +COMMON_INCLUDE_DIR="${STAGING_INCDIR}" | ||
19 | +COMMON_LIB_DIR="${STAGING_LIBDIR}" | ||
20 | case $host in | ||
21 | i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;; | ||
22 | x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;; | ||
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb index 20c7b2d37..391614b5f 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb | |||
@@ -19,6 +19,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ | |||
19 | file://xmlsec1-examples-allow-build-in-separate-dir.patch \ | 19 | file://xmlsec1-examples-allow-build-in-separate-dir.patch \ |
20 | file://0001-nss-nspr-fix-for-multilib.patch \ | 20 | file://0001-nss-nspr-fix-for-multilib.patch \ |
21 | file://run-ptest \ | 21 | file://run-ptest \ |
22 | file://ensure-search-path-non-host.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[md5sum] = "b66ec21e0a0ac331afb4b1bc5c9ef966" | 25 | SRC_URI[md5sum] = "b66ec21e0a0ac331afb4b1bc5c9ef966" |