From: Hongxu Jia Date: Sat, 1 Mar 2025 07:55:52 +0000 (+0800) Subject: go: remove support for GOROOT_FINAL X-Git-Tag: yocto-5.2~361 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=791ab77ac05f658ecd61525a3d9b1afaf8ac6e06;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git go: remove support for GOROOT_FINAL After upstream go applied commit [cmd: remove support for GOROOT_FINAL][1], GOROOT_FINAL variable is dropped and use option -trimpath to instead [2] The option -trimpath has already been added to GOBUILDFLAGS in go.bbclass [1] https://github.com/golang/go/commit/507d1b22f4b58ac68841582d0c2c0ab6b20e5a98 [2] https://github.com/golang/go/issues/62047 Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index e3e47820252..c81d9460699 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass @@ -15,7 +15,6 @@ GOROOT:class-native = "${STAGING_LIBDIR_NATIVE}/go" GOROOT:class-nativesdk = "${STAGING_DIR_TARGET}${libdir}/go" GOROOT = "${STAGING_LIBDIR}/go" export GOROOT -export GOROOT_FINAL = "${libdir}/go" export GOCACHE = "${B}/.cache" export GOARCH = "${TARGET_GOARCH}" diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc index db165792dcb..ca8469dbd91 100644 --- a/meta/recipes-devtools/go/go-common.inc +++ b/meta/recipes-devtools/go/go-common.inc @@ -38,7 +38,6 @@ export GOARCH ?= "${TARGET_GOARCH}" export GOARM ?= "${TARGET_GOARM}" export GO386 ?= "${TARGET_GO386}" export GOMIPS ?= "${TARGET_GOMIPS}" -export GOROOT_FINAL ?= "${libdir}/go" export GODEBUG = "gocachehash=1"