[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 128/246] gcc-runtime.inc: add CPP support for mips64-n32 tune



commit be15df509921dca879866d12b0898a1219ba5d70
Author: Juro Bystricky <juro bystricky intel com>
Date:   Mon Aug 29 15:45:36 2016 -0700

    gcc-runtime.inc: add CPP support for mips64-n32 tune
    
    This patch fixes the problem where the CPP compiler cannot find include files.
    The compiler is configured to look for the files in places that do not exist.
    When querying the CPP for search paths, we observe messages such as these:
    
    multilib configuration:
    
    MACHINE="qemumips64"
    require conf/multilib.conf
    MULTILIBS = "multilib:lib64 multilib:lib32"
    DEFAULTTUNE = "mips64-n32"
    DEFAULTTUNE_virtclass-multilib-lib64 = "mips64"
    DEFAULTTUNE_virtclass-multilib-lib32 = "mips32r2"
    
    ignoring nonexistent directory 
"<path>/sysroots/mips64-n32-poky-linux-gnun32/usr/include/c++/6.2.0/mips64-poky-linux/32
    
    single lib configuration:
    MACHINE="qemumips64"
    DEFAULTTUNE = "mips64-n32"
    ignoring nonexistent directory 
"<path>/sysroots/mips64-n32-poky-linux-gnun32/usr/include/c++/6.2.0/mips64-poky-linux/
    
    To fix this, create a symlink of the name CPP expects and point it to the corresponding "gnun32" 
directory.
    
    [YOCTO#10142]
    
    (From OE-Core rev: 55115f90f909d27599c686852e73df321ad1edff)
    
    (From OE-Core rev: fe61e95a3368d0bc0e66958d0e703b1e3c40c9bb)
    
    Signed-off-by: Juro Bystricky <juro bystricky intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/gcc/gcc-runtime.inc |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 99f50f8..fd624e2 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -80,6 +80,16 @@ do_install_append_class-target () {
        if [ "${TARGET_OS}" = "linux-gnuspe" ]; then
                ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
        fi
+
+       if [ "${TARGET_OS}" = "linux-gnun32" ]; then
+               if [ "${MULTILIBS}" != "" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
+                       ln -s ../${TARGET_SYS} 
${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+               else
+                       ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+               fi
+       fi
+
        if [ "${TCLIBC}" != "glibc" ]; then
                case "${TARGET_OS}" in
                        "linux-musl" | "linux-uclibc" | "linux-*spe") extra_target_os="linux";;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]