summaryrefslogtreecommitdiffstats
path: root/meta/classes/go.bbclass
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2017-09-12 09:50:23 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-12 23:55:29 +0100
commit397881ff1b16e18c43ed85b92cba48e8bd6afe78 (patch)
treec939771d9979f011da56aac90de4c0aa9f67aa51 /meta/classes/go.bbclass
parent2c3e27b71b72b77f6bbd1da95b96e03cbba61563 (diff)
downloadpoky-397881ff1b16e18c43ed85b92cba48e8bd6afe78.tar.gz
go.bbclass: remove some xxx_FINAL variables
GOROOT_FINAL is used by the Go linker for rewriting source paths when the build GOROOT is not the same as the runtime GOROOT, but the other _FINAL variables aren't really needed. (From OE-Core rev: 31aa0d8a62be95d093d3c7581efa41f74b9131ad) Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/go.bbclass')
-rw-r--r--meta/classes/go.bbclass19
1 files changed, 7 insertions, 12 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
index 0ff82ca2bb..c0b117d155 100644
--- a/meta/classes/go.bbclass
+++ b/meta/classes/go.bbclass
@@ -21,8 +21,7 @@ GO_PARALLEL_BUILD ?= "${@get_go_parallel_make(d)}"
21 21
22GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go" 22GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go"
23GOROOT = "${STAGING_LIBDIR}/go" 23GOROOT = "${STAGING_LIBDIR}/go"
24GOBIN_FINAL_class-native = "${GOROOT_FINAL}/bin" 24export GOROOT_FINAL = "${libdir}/go"
25GOBIN_FINAL = "${GOROOT_FINAL}/${GO_BUILD_BINDIR}"
26 25
27DEPENDS_GOLANG_class-target = "virtual/${TARGET_PREFIX}go virtual/${TARGET_PREFIX}go-runtime" 26DEPENDS_GOLANG_class-target = "virtual/${TARGET_PREFIX}go virtual/${TARGET_PREFIX}go-runtime"
28DEPENDS_GOLANG_class-native = "go-native" 27DEPENDS_GOLANG_class-native = "go-native"
@@ -38,18 +37,11 @@ GOTOOLDIR_class-native = "${STAGING_LIBDIR_NATIVE}/go/pkg/tool/${BUILD_GOTUPLE}"
38export GOTOOLDIR 37export GOTOOLDIR
39export CGO_ENABLED = "1" 38export CGO_ENABLED = "1"
40export GOROOT 39export GOROOT
41export GOROOT_FINAL = "${libdir}/go"
42export GOBIN_FINAL
43export GOPKG_FINAL = "${GOROOT_FINAL}/pkg/${TARGET_GOTUPLE}"
44export GOSRC_FINAL = "${GOROOT_FINAL}/src"
45export CGO_CFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CFLAGS}" 40export CGO_CFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CFLAGS}"
46export CGO_CPPFLAGS = "${TARGET_CPPFLAGS}" 41export CGO_CPPFLAGS = "${TARGET_CPPFLAGS}"
47export CGO_CXXFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CXXFLAGS}" 42export CGO_CXXFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CXXFLAGS}"
48export CGO_LDFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_LDFLAGS}" 43export CGO_LDFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_LDFLAGS}"
49 44
50FILES_${PN}-staticdev += "${GOSRC_FINAL}/${GO_IMPORT}"
51FILES_${PN}-staticdev += "${GOPKG_FINAL}/${GO_IMPORT}*"
52
53GO_INSTALL ?= "${GO_IMPORT}/..." 45GO_INSTALL ?= "${GO_IMPORT}/..."
54GO_INSTALL_FILTEROUT ?= "${GO_IMPORT}/vendor/" 46GO_INSTALL_FILTEROUT ?= "${GO_IMPORT}/vendor/"
55 47
@@ -92,10 +84,10 @@ go_do_compile() {
92do_compile[cleandirs] = "${B}/bin ${B}/pkg" 84do_compile[cleandirs] = "${B}/bin ${B}/pkg"
93 85
94go_do_install() { 86go_do_install() {
95 install -d ${D}${GOROOT_FINAL}/src/${GO_IMPORT} 87 install -d ${D}${libdir}/go/src/${GO_IMPORT}
96 tar -C ${S}/src/${GO_IMPORT} -cf - --exclude-vcs . | \ 88 tar -C ${S}/src/${GO_IMPORT} -cf - --exclude-vcs . | \
97 tar -C ${D}${GOROOT_FINAL}/src/${GO_IMPORT} --no-same-owner -xf - 89 tar -C ${D}${libdir}/go/src/${GO_IMPORT} --no-same-owner -xf -
98 tar -C ${B} -cf - pkg | tar -C ${D}${GOROOT_FINAL} --no-same-owner -xf - 90 tar -C ${B} -cf - pkg | tar -C ${D}${libdir}/go --no-same-owner -xf -
99 91
100 if [ -n "`ls ${B}/${GO_BUILD_BINDIR}/`" ]; then 92 if [ -n "`ls ${B}/${GO_BUILD_BINDIR}/`" ]; then
101 install -d ${D}${bindir} 93 install -d ${D}${bindir}
@@ -104,3 +96,6 @@ go_do_install() {
104} 96}
105 97
106EXPORT_FUNCTIONS do_unpack do_configure do_compile do_install 98EXPORT_FUNCTIONS do_unpack do_configure do_compile do_install
99
100FILES_${PN}-dev = "${libdir}/go/src"
101FILES_${PN}-staticdev = "${libdir}/go/pkg"