diff options
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-2.15/use-sysroot-cxx-headers.patch')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.15/use-sysroot-cxx-headers.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.15/use-sysroot-cxx-headers.patch b/meta/recipes-core/eglibc/eglibc-2.15/use-sysroot-cxx-headers.patch new file mode 100644 index 0000000000..7f8225371c --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.15/use-sysroot-cxx-headers.patch | |||
@@ -0,0 +1,42 @@ | |||
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 | @@ -1094,11 +1094,10 @@ if test -n "$sysheaders"; then | ||
14 | -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" | ||
15 | if test -n "$CXX"; then | ||
16 | CXX_SYSINCLUDES= | ||
17 | - cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && | ||
18 | cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` && | ||
19 | for d in include "$cxxmachine/include"; do | ||
20 | - i=../../../../$d/c++/$cxxversion | ||
21 | - cxxheaders=`$CXX -print-file-name="$i"` && | ||
22 | + i="$prefix/$d/c++" | ||
23 | + cxxheaders=`$CXX -print-sysroot`"$i" && | ||
24 | test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && | ||
25 | CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \ | ||
26 | -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" | ||
27 | --- a/configure | ||
28 | +++ b/configure | ||
29 | @@ -5618,11 +5618,10 @@ if test -n "$sysheaders"; then | ||
30 | -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" | ||
31 | if test -n "$CXX"; then | ||
32 | CXX_SYSINCLUDES= | ||
33 | - cxxversion=`$CXX -dumpversion 2>&5` && | ||
34 | cxxmachine=`$CXX -dumpmachine 2>&5` && | ||
35 | for d in include "$cxxmachine/include"; do | ||
36 | - i=../../../../$d/c++/$cxxversion | ||
37 | - cxxheaders=`$CXX -print-file-name="$i"` && | ||
38 | + i="$prefix/$d/c++" | ||
39 | + cxxheaders=`$CXX -print-sysroot`"$i" && | ||
40 | test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && | ||
41 | CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \ | ||
42 | -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" | ||