[oe-commits] [openembedded-core] 47/65: go-native: Install bootstrap binaries with 1.4 suffix

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit c46faa132d39d3dc235a019d9abf6e46f74e3bae
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Mon Mar 20 09:47:35 2017 -0700

    go-native: Install bootstrap binaries with 1.4 suffix
    
    Currently, bin/go and bin/gofmt collide between go-native
    and go-bootstrap-native packages, these are scripts anyway
    which call the go compiler proper from right install, in
    this case create go1.4 and gofmt1.4 names for these scripts
    to avoid namespace collision
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/go/go-native.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/go/go-native.inc b/meta/recipes-devtools/go/go-native.inc
index c1ada51..c21f8fd 100644
--- a/meta/recipes-devtools/go/go-native.inc
+++ b/meta/recipes-devtools/go/go-native.inc
@@ -22,14 +22,14 @@ do_compile() {
 }
 
 make_wrapper() {
-	rm -f ${D}${bindir}/$2
-	cat <<END >${D}${bindir}/$2
+	rm -f ${D}${bindir}/$2$3
+	cat <<END >${D}${bindir}/$2$3
 #!/bin/bash
 here=\`dirname \$0\`
-export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}"
-\$here/../lib/go/bin/$1 "\$@"
+export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go$3\`}"
+\$here/../lib/go$3/bin/$1 "\$@"
 END
-	chmod +x ${D}${bindir}/$2
+	chmod +x ${D}${bindir}/$2$3
 }
 
 do_install() {
@@ -45,7 +45,7 @@ do_install() {
 	do
 		base=`basename $f`
 		install -m755 $f ${D}${libdir}/go${BOOTSTRAP}/bin
-		make_wrapper $base $base
+		make_wrapper $base $base ${BOOTSTRAP}
 	done
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.