diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-12-16 14:33:38 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-19 09:29:18 +0000 |
commit | 45987c5135d22757ed2eb06b37e192d73309f59f (patch) | |
tree | 9b4ca0be013dbc1bbf8dbdc19c53f0c2104390e9 /meta/recipes-core/eglibc/eglibc-2.14/use-sysroot-cxx-headers.patch | |
parent | af9c75c8f5249728877770e3040cbc46c0038f30 (diff) | |
download | poky-45987c5135d22757ed2eb06b37e192d73309f59f.tar.gz |
eglibc: Fixes for running regression tests
Override cxx-sysincludes along with CC and CXX
since it contains path pointing to tcbootstrap
sysroot which does not have c++ headers and libraries
Drop shorten-build-commands patch since it
did not override the include flags for c++ headers
when tests written in c++ are executed the @includes file
does not get updated to add c++ header paths
This patch only reduced the build output anyway
Add a patch to point eglibc to look into c++
headers the way OE installs them its not standard
install e.g. usr/include/c++/GCC_VER but instead
usr/include/c++. This lets g++ find the headers
in right place when compiling c++ testcases
(From OE-Core rev: dc1fbfb2cd3c0d35f212523189ea7b1621906201)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-2.14/use-sysroot-cxx-headers.patch')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.14/use-sysroot-cxx-headers.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/use-sysroot-cxx-headers.patch b/meta/recipes-core/eglibc/eglibc-2.14/use-sysroot-cxx-headers.patch new file mode 100644 index 0000000000..c06eebfac4 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.14/use-sysroot-cxx-headers.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | build system of glibc currently adds the cxx headers path by detecting | ||
2 | it using provided CXX and expects that they are installed w.r.t to standard | ||
3 | installation location but in OE we install and use cxx headers from target | ||
4 | sysroot therefore that code needs to be adapted for OE | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE-specific] | ||
7 | |||
8 | -Khem | ||
9 | |||
10 | |||
11 | --- a/configure.in | ||
12 | +++ b/configure.in | ||
13 | @@ -1118,9 +1118,8 @@ if test -n "$sysheaders"; then | ||
14 | SYSINCLUDES="$SYSINCLUDES \ | ||
15 | -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" | ||
16 | if test -n "$CXX"; then | ||
17 | - cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && | ||
18 | cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` && | ||
19 | - cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" && | ||
20 | + cxxheaders=`$CXX -print-sysroot`"$prefix/include/c++" && | ||
21 | CXX_SYSINCLUDES="-isystem $cxxheaders \ | ||
22 | -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" | ||
23 | fi | ||
24 | --- a/configure | ||
25 | +++ b/configure | ||
26 | @@ -5544,9 +5544,8 @@ if test -n "$sysheaders"; then | ||
27 | SYSINCLUDES="$SYSINCLUDES \ | ||
28 | -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" | ||
29 | if test -n "$CXX"; then | ||
30 | - cxxversion=`$CXX -dumpversion 2>&5` && | ||
31 | cxxmachine=`$CXX -dumpmachine 2>&5` && | ||
32 | - cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" && | ||
33 | + cxxheaders=`$CXX -print-sysroot`"$prefix/include/c++" && | ||
34 | CXX_SYSINCLUDES="-isystem $cxxheaders \ | ||
35 | -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" | ||
36 | fi | ||