[PATCH 1/5] umoci: adjust inherit and fix CGO settings


Chen Qi
 

go.bbclass already inherits goarch.bbclass.

The CGO_CFLAGS and CGO_LDFLAGS should use target flags as set in
oe-core's go.bbclass, not the SDK related ones.

Signed-off-by: Chen Qi <Qi.Chen@...>
---
recipes-containers/umoci/umoci_git.bb | 4 ----
1 file changed, 4 deletions(-)

diff --git a/recipes-containers/umoci/umoci_git.bb b/recipes-containers/umoci/umoci_git.bb
index a2c0827..525a967 100644
--- a/recipes-containers/umoci/umoci_git.bb
+++ b/recipes-containers/umoci/umoci_git.bb
@@ -14,7 +14,6 @@ PV = "v0.4.7-dev+git${SRCPV}"
S = "${WORKDIR}/github.com/opencontainers/umoci"
GO_IMPORT = "github.com/opencontainers/umoci"

-inherit goarch
inherit go

# This disables seccomp and apparmor, which are on by default in the
@@ -53,7 +52,6 @@ do_compile:class-native () {
}

do_compile() {
- export GOARCH="${TARGET_GOARCH}"
export GOPATH="${WORKDIR}/git/"

# Pass the needed cflags/ldflags so that cgo
@@ -61,8 +59,6 @@ do_compile() {
export CGO_ENABLED="1"
export CFLAGS=""
export LDFLAGS=""
- export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"

export GO111MODULE=off

--
2.36.0