Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 1 | From 1eb68f65fd73443d862ca5f36f3b6041e2b0f13a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 10 Mar 2022 18:53:13 -0800 |
| 4 | Subject: [PATCH] configure: Limit the header search to sysroot |
| 5 | |
| 6 | Hardcoded paths in configure.ac means it starts to poke at host system |
| 7 | include paths, which is least we want in a cross build, therefore prefix |
| 8 | these paths with STAGING_SYSROOT |
| 9 | |
| 10 | Upstream-Status: Inappropriate [OE Specific] |
| 11 | |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | configure.ac | 20 ++++++++++---------- |
| 15 | 1 file changed, 10 insertions(+), 10 deletions(-) |
| 16 | |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
Andrew Geissler | 8f84068 | 2023-07-21 09:09:43 -0500 | [diff] [blame^] | 19 | @@ -907,7 +907,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 20 | [ 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 Geissler | 8f84068 | 2023-07-21 09:09:43 -0500 | [diff] [blame^] | 28 | @@ -1603,7 +1603,7 @@ AC_SUBST(qmake) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 29 | |
| 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 Geissler | 8f84068 | 2023-07-21 09:09:43 -0500 | [diff] [blame^] | 37 | @@ -3699,7 +3699,7 @@ AC_SUBST(enable_decompression) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 38 | 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 |