summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2014-07-03 17:00:26 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-10 17:38:33 +0100
commit90362a4de5cbed6815fb84be950030ebde5bc3fe (patch)
tree9ae8280991f6e2b3bb9682ba1def866cd146217a
parent76940edcdfe7fc40b7b7c2ef67fdcc5329f69463 (diff)
downloadpoky-90362a4de5cbed6815fb84be950030ebde5bc3fe.tar.gz
gcc: Ensure c++ includes are in /usr/include/c++/${BINV}
It was observed that code using STLport 4.6 fails to compile under the SDK with the following error message: .../includes/cstddef:38:46: fatal error: ../4.7.2/cstddef: No such file or directory STLport 4.6 (screwily) assumes that the C++ system headers live in a gcc-versioned subdirectory, for gcc>=3.0; cf http://sourceforge.net/p/stlport/code/ci/STLport-4.6-patch/tree/stlport/config/stl_gcc.h#l269. This assumption is *almost always* valid, because that matches the default setting of --with-gxx-include-dir. We can match that behavior by appending "/${BINV}" to our own --with-gxx-include-dir settings. Natinst-CAR-ID: 446449 Natinst-Reviewboard-ID: 57209 Acked-by: Ken Sharp <ken.sharp@ni.com> Acked-by: Ben Shelton <ben.shelton@ni.com> (From OE-Core rev: 5a2ff3e8f7cd7a47a5ab4e581847ecc4df87fca3) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.8.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
index 9f2928b78a..2816f13a6f 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -115,7 +115,7 @@ EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \
115EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float " 115EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
116 116
117EXTRA_OECONF_PATHS = " \ 117EXTRA_OECONF_PATHS = " \
118 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ 118 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \
119 --with-sysroot=${STAGING_DIR_TARGET} \ 119 --with-sysroot=${STAGING_DIR_TARGET} \
120 --with-build-sysroot=${STAGING_DIR_TARGET}" 120 --with-build-sysroot=${STAGING_DIR_TARGET}"
121 121
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 63adae8386..f0a03a6519 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -9,7 +9,7 @@ GCCMULTILIB = "--enable-multilib"
9 9
10require gcc-configure-common.inc 10require gcc-configure-common.inc
11 11
12EXTRA_OECONF_PATHS = "--with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++ \ 12EXTRA_OECONF_PATHS = "--with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++/${BINV} \
13 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ 13 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
14 --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ 14 --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \
15 --with-build-sysroot=${STAGING_DIR_TARGET}" 15 --with-build-sysroot=${STAGING_DIR_TARGET}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 0bf29e34d3..cf3e5e891d 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -21,7 +21,7 @@ EXTRA_OECONF += "--disable-libunwind-exceptions \
21 --with-system-zlib " 21 --with-system-zlib "
22 22
23EXTRA_OECONF_PATHS = " \ 23EXTRA_OECONF_PATHS = " \
24 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ 24 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \
25 --with-sysroot=${STAGING_DIR_TARGET} \ 25 --with-sysroot=${STAGING_DIR_TARGET} \
26 --with-build-sysroot=${STAGING_DIR_TARGET}" 26 --with-build-sysroot=${STAGING_DIR_TARGET}"
27 27
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 70f9e0eb52..974c80c4d8 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -3,7 +3,7 @@ require gcc-configure-common.inc
3CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" 3CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
4 4
5EXTRA_OECONF_PATHS = " \ 5EXTRA_OECONF_PATHS = " \
6 --with-gxx-include-dir=${includedir}/c++/ \ 6 --with-gxx-include-dir=${includedir}/c++/${BINV} \
7 --with-sysroot=${STAGING_DIR_TARGET} \ 7 --with-sysroot=${STAGING_DIR_TARGET} \
8 --with-build-sysroot=${STAGING_DIR_TARGET}" 8 --with-build-sysroot=${STAGING_DIR_TARGET}"
9 9
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index de906d6241..59c554daf5 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -5,7 +5,7 @@ EXTRA_OECONF_PATHS = " \
5 --with-sysroot=/ \ 5 --with-sysroot=/ \
6 --with-build-sysroot=${STAGING_DIR_TARGET} \ 6 --with-build-sysroot=${STAGING_DIR_TARGET} \
7 --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \ 7 --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \
8 --with-gxx-include-dir=${includedir}/c++/" 8 --with-gxx-include-dir=${includedir}/c++/${BINV}"
9 9
10EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" 10EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}"
11 11