From: Matt Madison <matt@madison.systems>
Date: Thu, 14 Sep 2017 19:22:27 +0000 (-0300)
Subject: go-crosssdk: fix host/target references and cleanup
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~19936
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94cfa563388fb39e6a409eefcae1598a9d426a5c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

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>
---

diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc
index e9bc677131a..471c75b3d58 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"