[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7808/8267] go-crosssdk: fix host/target references and cleanup



commit 82ba908d86a75401c86b966d1579a9e5e00ff05d
Author: Matt Madison <matt@madison.systems>
Date:   Thu Sep 14 16:22:27 2017 -0300

    go-crosssdk: fix host/target references and cleanup
    
    * The _FOR_TARGET variables need to include SDKNATIVEPATH
    * Install tools (cmd) only, and for the build host
    * Remove unnecessary FILES setting
    
    Corrects some errors when the build host architecture
    is different from the SDKMACHINE's.
    
    (From OE-Core rev: 94cfa563388fb39e6a409eefcae1598a9d426a5c)
    
    Signed-off-by: Matt Madison <matt@madison.systems>
    Signed-off-by: Otavio Salvador <otavio ossystems com br>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/go/go-crosssdk.inc |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc
index e9bc677..471c75b 100644
--- a/meta/recipes-devtools/go/go-crosssdk.inc
+++ b/meta/recipes-devtools/go/go-crosssdk.inc
@@ -11,8 +11,9 @@ export GOARCH = "${TARGET_GOARCH}"
 export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go"
 export GOROOT_FINAL = "${libdir}/go"
 export CGO_ENABLED = "1"
-export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}"
-export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}"
+export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}"
+export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}"
+export GO_INSTALL = "cmd"
 CC = "${@d.getVar('BUILD_CC', True).strip()}"
 
 do_configure[noexec] = "1"
@@ -43,13 +44,11 @@ do_install() {
        install -d ${D}${libdir}/go/bin
        install -d ${D}${libdir}/go/pkg/tool
        install -d ${D}${bindir}
-       cp --preserve=mode,timestamps -R ${S}/pkg/tool/${TARGET_GOTUPLE} ${D}${libdir}/go/pkg/tool/
-       for f in ${B}/${GO_BUILD_BINDIR}/*
+       cp --preserve=mode,timestamps -R ${S}/pkg/tool/${BUILD_GOTUPLE} ${D}${libdir}/go/pkg/tool/
+       for f in ${B}/bin/*
        do
                base=`basename $f`
                install -m755 $f ${D}${libdir}/go/bin
                make_wrapper $base ${TARGET_PREFIX}$base
        done
 }
-
-FILES_${PN}-staticdev = "${libdir}/go/pkg"


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