blob: b03c48e58165390676490c1c9f2a9bd239be35ea [file] [log] [blame]
Andrew Geissler9aee5002022-03-30 16:27:02 +00001From 1eb68f65fd73443d862ca5f36f3b6041e2b0f13a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 10 Mar 2022 18:53:13 -0800
4Subject: [PATCH] configure: Limit the header search to sysroot
5
6Hardcoded paths in configure.ac means it starts to poke at host system
7include paths, which is least we want in a cross build, therefore prefix
8these paths with STAGING_SYSROOT
9
10Upstream-Status: Inappropriate [OE Specific]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 configure.ac | 20 ++++++++++----------
15 1 file changed, 10 insertions(+), 10 deletions(-)
16
Andrew Geissler9aee5002022-03-30 16:27:02 +000017--- a/configure.ac
18+++ b/configure.ac
Andrew Geissler8f840682023-07-21 09:09:43 -050019@@ -907,7 +907,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER],
Andrew Geissler9aee5002022-03-30 16:27:02 +000020 [ PY_MAJOR="$1"
21 PY_MINOR="$2"
22 PY_VERSION="python$PY_MAJOR.$PY_MINOR"
23- PY_INCLUDE_DIRS="-I/usr/include/${PY_VERSION}m -I/usr/include/${PY_VERSION}"
24+ PY_INCLUDE_DIRS="-I${STAGING_INCDIR}/${PY_VERSION}m -I${STAGING_INCDIR}/${PY_VERSION}"
25 saved_CFLAGS="$CFLAGS"
26 saved_CPPFLAGS="$CPPFLAGS"
27 CFLAGS="$CFLAGS $PY_INCLUDE_DIRS"
Andrew Geissler8f840682023-07-21 09:09:43 -050028@@ -1603,7 +1603,7 @@ AC_SUBST(qmake)
Andrew Geissler9aee5002022-03-30 16:27:02 +000029
30 enable_qt3d=false
31 AS_IF([test "x$do_qt3d" != "xno"], [
32- if test -f /usr/include/Coin3/Inventor/Qt/SoQt.h -o -f /usr/include/Inventor/Qt/SoQt.h
33+ if test -f ${STAGING_INCDIR}/Coin3/Inventor/Qt/SoQt.h -o -f ${STAGING_INCDIR}/Inventor/Qt/SoQt.h
34 then
35 enable_qt3d=$enable_qt
36 elif test x"$do_qt3d" = x"yes"
Andrew Geissler8f840682023-07-21 09:09:43 -050037@@ -3699,7 +3699,7 @@ AC_SUBST(enable_decompression)
Andrew Geissler9aee5002022-03-30 16:27:02 +000038 AC_SUBST(enable_lzma)
39
40 dnl check for array sessions
41-if test -f /usr/include/sn/arsess.h
42+if test -f ${STAGING_INCDIR}/sn/arsess.h
43 then
44 pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread
45 else