From 49a6827cbdb6e00d3af5e5c4a4479c47573a4533 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 12 May 2023 13:04:04 +0800 Subject: yq: Redefine do_compile This reverts commit 9b87b12885243c8cbba933e218c325416ec4d19d which states the linkshared issue is resolved. Actually the issue still exists as build fails on qemuarm64 and we still need the fix [1]. So add the fix [1] back and it's also better define its own do_compile and not let the do_compile logic in go.bbclass affect the build. [1] https://git.yoctoproject.org/meta-virtualization/commit/?id=d2a630ce6cf67a145f218012fbf02e4d0d9648df Signed-off-by: Bruce Ashfield --- recipes-devtools/yq/yq_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-devtools/yq/yq_git.bb b/recipes-devtools/yq/yq_git.bb index 45f2f970..bd474a79 100644 --- a/recipes-devtools/yq/yq_git.bb +++ b/recipes-devtools/yq/yq_git.bb @@ -50,7 +50,7 @@ GO_IMPORT = "github.com/mikefarah/yq" inherit go ptest -do_compile:prepend() { +do_compile() { # arrange for some of the golang built ins to be found ( cd ${WORKDIR}/build/src/ @@ -60,6 +60,7 @@ do_compile:prepend() { # arrange for the fetched dependencies to be found export GOPATH="${GOPATH}:${WORKDIR}/build/vendor/" export GO111MODULE=off + ${GO} install ${GOBUILDFLAGS} `go_list_packages` } do_install:append() { -- cgit v1.2.3-54-g00ecf