]> code.ossystems Code Review - openembedded-core.git/commitdiff
go.bbclass: rename GO_TMPDIR -> GOTMPDIR
authorMatt Madison <matt@madison.systems>
Sun, 4 Mar 2018 21:09:27 +0000 (13:09 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 6 Mar 2018 14:36:32 +0000 (06:36 -0800)
and export it. Go 1.10 now supports using this
separate variable locating its temporary files.

TMPDIR is still set, for compatibility with go1.9;
that can be dropped once 1.9 is retired.

Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/go.bbclass

index a01b28bccda790f275d655b68960f3d6e6d894bb..96302a187ce62cf2c39f37b23acc4f7b68596379 100644 (file)
@@ -49,8 +49,8 @@ GO_INSTALL_FILTEROUT ?= "${GO_IMPORT}/vendor/"
 B = "${WORKDIR}/build"
 export GOPATH = "${B}"
 export GOCACHE = "off"
-GO_TMPDIR ?= "${WORKDIR}/go-tmp"
-GO_TMPDIR[vardepvalue] = ""
+export GOTMPDIR ?= "${WORKDIR}/go-tmp"
+GOTMPDIR[vardepvalue] = ""
 
 python go_do_unpack() {
     src_uri = (d.getVar('SRC_URI') or "").split()
@@ -85,9 +85,10 @@ go_list_package_tests() {
 go_do_configure() {
        ln -snf ${S}/src ${B}/
 }
+do_configure[dirs] =+ "${GOTMPDIR}"
 
 go_do_compile() {
-       export TMPDIR="${GO_TMPDIR}"
+       export TMPDIR="${GOTMPDIR}"
        ${GO} env
        if [ -n "${GO_INSTALL}" ]; then
                if [ -n "${GO_LINKSHARED}" ]; then
@@ -97,11 +98,11 @@ go_do_compile() {
                ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} `go_list_packages`
        fi
 }
-do_compile[dirs] =+ "${GO_TMPDIR}"
+do_compile[dirs] =+ "${GOTMPDIR}"
 do_compile[cleandirs] = "${B}/bin ${B}/pkg"
 
 do_compile_ptest() {
-    export TMPDIR="${GO_TMPDIR}"
+       export TMPDIR="${GOTMPDIR}"
     rm -f ${B}/.go_compiled_tests.list
        go_list_package_tests | while read pkg; do
                cd ${B}/src/$pkg
@@ -110,7 +111,7 @@ do_compile_ptest() {
                        sed -e's,/\./,/,'>> ${B}/.go_compiled_tests.list
        done
 }
-do_compile_ptest_base[dirs] =+ "${GO_TMPDIR}"
+do_compile_ptest_base[dirs] =+ "${GOTMPDIR}"
 
 go_do_install() {
        install -d ${D}${libdir}/go/src/${GO_IMPORT}