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. 74b66d1911

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>
This commit is contained in:
Anatol Belski
2021-08-11 14:39:43 +02:00
committed by Armin Kuster
parent e4a74a0f0f
commit b472160c77
2 changed files with 23 additions and 0 deletions
@@ -0,0 +1,22 @@
xmlsec1: Fix configure QA error caused by host lookup path
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.
It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
--- a/configure.ac.orig 2021-01-13 14:37:42.254991177 +0000
+++ b/configure.ac 2021-01-13 14:40:56.546269330 +0000
@@ -250,8 +250,8 @@
dnl ==========================================================================
dnl Common installation locations
dnl ==========================================================================
-COMMON_INCLUDE_DIR="/usr/include /usr/local/include"
-COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib"
+COMMON_INCLUDE_DIR="${STAGING_INCDIR}"
+COMMON_LIB_DIR="${STAGING_LIBDIR}"
case $host in
i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;;
x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;;
@@ -19,6 +19,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
file://xmlsec1-examples-allow-build-in-separate-dir.patch \
file://0001-nss-nspr-fix-for-multilib.patch \
file://run-ptest \
file://ensure-search-path-non-host.patch \
"
SRC_URI[md5sum] = "b66ec21e0a0ac331afb4b1bc5c9ef966"