1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From 1eb68f65fd73443d862ca5f36f3b6041e2b0f13a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 10 Mar 2022 18:53:13 -0800
Subject: [PATCH] configure: Limit the header search to sysroot
Hardcoded paths in configure.ac means it starts to poke at host system
include paths, which is least we want in a cross build, therefore prefix
these paths with STAGING_SYSROOT
Upstream-Status: Inappropriate [OE Specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5d24714..4e2d8ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -913,7 +913,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER],
[ PY_MAJOR="$1"
PY_MINOR="$2"
PY_VERSION="python$PY_MAJOR.$PY_MINOR"
- PY_INCLUDE_DIRS="-I/usr/include/${PY_VERSION}m -I/usr/include/${PY_VERSION}"
+ PY_INCLUDE_DIRS="-I${STAGING_INCDIR}/${PY_VERSION}m -I${STAGING_INCDIR}/${PY_VERSION}"
saved_CFLAGS="$CFLAGS"
saved_CPPFLAGS="$CPPFLAGS"
CFLAGS="$CFLAGS $PY_INCLUDE_DIRS"
@@ -1524,7 +1524,7 @@ AC_SUBST(qmake)
enable_qt3d=false
AS_IF([test "x$do_qt3d" != "xno"], [
- if test -f /usr/include/Coin3/Inventor/Qt/SoQt.h -o -f /usr/include/Inventor/Qt/SoQt.h
+ if test -f ${STAGING_INCDIR}/Coin3/Inventor/Qt/SoQt.h -o -f ${STAGING_INCDIR}/Inventor/Qt/SoQt.h
then
enable_qt3d=$enable_qt
elif test x"$do_qt3d" = x"yes"
@@ -3810,13 +3810,13 @@ then
saved_CFLAGS="$CFLAGS"
saved_CPPFLAGS="$CPPFLAGS"
- NSS_INC_DIRS="-I/usr/include/nss -I/usr/include/nss3"
- NSPR_INC_DIRS="-I/usr/include/nspr -I/usr/include/nspr4"
+ NSS_INC_DIRS="-I${STAGING_INCDIR}/nss -I${STAGING_INCDIR}/nss3"
+ NSPR_INC_DIRS="-I${STAGING_INCDIR}/nspr -I${STAGING_INCDIR}/nspr4"
CFLAGS="$CFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS"
CPPFLAGS="$CPPFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS"
- AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I/usr/include/nss], [
- AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I/usr/include/nss3], [
+ AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss], [
+ AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss3], [
enable_secure=false
if test "$do_secure" = "yes"
then
@@ -3826,8 +3826,8 @@ then
])
AC_SUBST(NSSCFLAGS)
- AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr], [
- AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr4], [
+ AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr], [
+ AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr4], [
enable_secure=false
if test "$do_secure" = "yes"
then
@@ -3837,7 +3837,7 @@ then
])
AC_SUBST(NSPRCFLAGS)
- AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I/usr/include/sasl], [
+ AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I${STAGING_INCDIR}/sasl], [
enable_secure=false
if test "$do_secure" = "yes"
then
@@ -3938,7 +3938,7 @@ AC_SUBST(enable_decompression)
AC_SUBST(enable_lzma)
dnl check for array sessions
-if test -f /usr/include/sn/arsess.h
+if test -f ${STAGING_INCDIR}/sn/arsess.h
then
pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread
else
--
2.35.1
|
