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 | |
| 17 | diff --git a/configure.ac b/configure.ac |
| 18 | index 5d24714..4e2d8ec 100644 |
| 19 | --- a/configure.ac |
| 20 | +++ b/configure.ac |
| 21 | @@ -913,7 +913,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], |
| 22 | [ PY_MAJOR="$1" |
| 23 | PY_MINOR="$2" |
| 24 | PY_VERSION="python$PY_MAJOR.$PY_MINOR" |
| 25 | - PY_INCLUDE_DIRS="-I/usr/include/${PY_VERSION}m -I/usr/include/${PY_VERSION}" |
| 26 | + PY_INCLUDE_DIRS="-I${STAGING_INCDIR}/${PY_VERSION}m -I${STAGING_INCDIR}/${PY_VERSION}" |
| 27 | saved_CFLAGS="$CFLAGS" |
| 28 | saved_CPPFLAGS="$CPPFLAGS" |
| 29 | CFLAGS="$CFLAGS $PY_INCLUDE_DIRS" |
| 30 | @@ -1524,7 +1524,7 @@ AC_SUBST(qmake) |
| 31 | |
| 32 | enable_qt3d=false |
| 33 | AS_IF([test "x$do_qt3d" != "xno"], [ |
| 34 | - if test -f /usr/include/Coin3/Inventor/Qt/SoQt.h -o -f /usr/include/Inventor/Qt/SoQt.h |
| 35 | + if test -f ${STAGING_INCDIR}/Coin3/Inventor/Qt/SoQt.h -o -f ${STAGING_INCDIR}/Inventor/Qt/SoQt.h |
| 36 | then |
| 37 | enable_qt3d=$enable_qt |
| 38 | elif test x"$do_qt3d" = x"yes" |
| 39 | @@ -3810,13 +3810,13 @@ then |
| 40 | |
| 41 | saved_CFLAGS="$CFLAGS" |
| 42 | saved_CPPFLAGS="$CPPFLAGS" |
| 43 | - NSS_INC_DIRS="-I/usr/include/nss -I/usr/include/nss3" |
| 44 | - NSPR_INC_DIRS="-I/usr/include/nspr -I/usr/include/nspr4" |
| 45 | + NSS_INC_DIRS="-I${STAGING_INCDIR}/nss -I${STAGING_INCDIR}/nss3" |
| 46 | + NSPR_INC_DIRS="-I${STAGING_INCDIR}/nspr -I${STAGING_INCDIR}/nspr4" |
| 47 | CFLAGS="$CFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS" |
| 48 | CPPFLAGS="$CPPFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS" |
| 49 | |
| 50 | - AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I/usr/include/nss], [ |
| 51 | - AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I/usr/include/nss3], [ |
| 52 | + AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss], [ |
| 53 | + AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss3], [ |
| 54 | enable_secure=false |
| 55 | if test "$do_secure" = "yes" |
| 56 | then |
| 57 | @@ -3826,8 +3826,8 @@ then |
| 58 | ]) |
| 59 | AC_SUBST(NSSCFLAGS) |
| 60 | |
| 61 | - AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr], [ |
| 62 | - AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr4], [ |
| 63 | + AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr], [ |
| 64 | + AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr4], [ |
| 65 | enable_secure=false |
| 66 | if test "$do_secure" = "yes" |
| 67 | then |
| 68 | @@ -3837,7 +3837,7 @@ then |
| 69 | ]) |
| 70 | AC_SUBST(NSPRCFLAGS) |
| 71 | |
| 72 | - AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I/usr/include/sasl], [ |
| 73 | + AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I${STAGING_INCDIR}/sasl], [ |
| 74 | enable_secure=false |
| 75 | if test "$do_secure" = "yes" |
| 76 | then |
| 77 | @@ -3938,7 +3938,7 @@ AC_SUBST(enable_decompression) |
| 78 | AC_SUBST(enable_lzma) |
| 79 | |
| 80 | dnl check for array sessions |
| 81 | -if test -f /usr/include/sn/arsess.h |
| 82 | +if test -f ${STAGING_INCDIR}/sn/arsess.h |
| 83 | then |
| 84 | pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread |
| 85 | else |
| 86 | -- |
| 87 | 2.35.1 |
| 88 | |