diff options
| author |   Matt Madison <matt@madison.systems> | 2017-09-12 09:50:23 -0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-12 23:51:37 +0100 |
| commit | 31aa0d8a62be95d093d3c7581efa41f74b9131ad (patch) | |
| tree | 453d4337b7a2647154be85f8bfeee15bbc310c1e /meta/classes | |
| parent | 2d37f60c2606de216aaa2d593b73b1de0a5c031e (diff) | |
| download | openembedded-core-contrib-31aa0d8a62be95d093d3c7581efa41f74b9131ad.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.
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')
| -rw-r--r-- | meta/classes/go.bbclass | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index 0ff82ca2bb1..c0b117d155e 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass @@ -21,8 +21,7 @@ GO_PARALLEL_BUILD ?= "${@get_go_parallel_make(d)}" GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go" GOROOT = "${STAGING_LIBDIR}/go" -GOBIN_FINAL_class-native = "${GOROOT_FINAL}/bin" -GOBIN_FINAL = "${GOROOT_FINAL}/${GO_BUILD_BINDIR}" +export GOROOT_FINAL = "${libdir}/go" DEPENDS_GOLANG_class-target = "virtual/${TARGET_PREFIX}go virtual/${TARGET_PREFIX}go-runtime" DEPENDS_GOLANG_class-native = "go-native" @@ -38,18 +37,11 @@ GOTOOLDIR_class-native = "${STAGING_LIBDIR_NATIVE}/go/pkg/tool/${BUILD_GOTUPLE}" export GOTOOLDIR export CGO_ENABLED = "1" export GOROOT -export GOROOT_FINAL = "${libdir}/go" -export GOBIN_FINAL -export GOPKG_FINAL = "${GOROOT_FINAL}/pkg/${TARGET_GOTUPLE}" -export GOSRC_FINAL = "${GOROOT_FINAL}/src" export CGO_CFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CFLAGS}" export CGO_CPPFLAGS = "${TARGET_CPPFLAGS}" export CGO_CXXFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_CXXFLAGS}" export CGO_LDFLAGS = "${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_LDFLAGS}" -FILES_${PN}-staticdev += "${GOSRC_FINAL}/${GO_IMPORT}" -FILES_${PN}-staticdev += "${GOPKG_FINAL}/${GO_IMPORT}*" - GO_INSTALL ?= "${GO_IMPORT}/..." GO_INSTALL_FILTEROUT ?= "${GO_IMPORT}/vendor/" @@ -92,10 +84,10 @@ go_do_compile() { do_compile[cleandirs] = "${B}/bin ${B}/pkg" go_do_install() { - install -d ${D}${GOROOT_FINAL}/src/${GO_IMPORT} + install -d ${D}${libdir}/go/src/${GO_IMPORT} tar -C ${S}/src/${GO_IMPORT} -cf - --exclude-vcs . | \ - tar -C ${D}${GOROOT_FINAL}/src/${GO_IMPORT} --no-same-owner -xf - - tar -C ${B} -cf - pkg | tar -C ${D}${GOROOT_FINAL} --no-same-owner -xf - + tar -C ${D}${libdir}/go/src/${GO_IMPORT} --no-same-owner -xf - + tar -C ${B} -cf - pkg | tar -C ${D}${libdir}/go --no-same-owner -xf - if [ -n "`ls ${B}/${GO_BUILD_BINDIR}/`" ]; then install -d ${D}${bindir} @@ -104,3 +96,6 @@ go_do_install() { } EXPORT_FUNCTIONS do_unpack do_configure do_compile do_install + +FILES_${PN}-dev = "${libdir}/go/src" +FILES_${PN}-staticdev = "${libdir}/go/pkg" |