From 4eca42bc3b21026639d31930417c7f1bc20682ef Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 12 Aug 2019 10:33:11 +0800 Subject: cni: remove unnecessary GO settings These settings are either in go.bbclass or duplicate, thus removing them. Keep only CGO_ENABLED and GOPATH to easier manipulation while upgrading cni. Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- recipes-networking/cni/cni_git.bb | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'recipes-networking/cni/cni_git.bb') diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index d07154bb..266ee691 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -29,18 +29,6 @@ inherit go inherit goarch do_compile() { - export GOARCH="${TARGET_GOARCH}" - export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" - export GOPATH="${S}/src/import:${S}/src/import/vendor" - - # Pass the needed cflags/ldflags so that cgo - # can find the needed headers files and libraries - 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}" - # link fixups for compilation rm -f ${S}/src/import/vendor/src mkdir -p ${S}/src/import/vendor/ @@ -56,13 +44,7 @@ do_compile() { ln -sf ${WORKDIR}/plugins ${S}/src/import/vendor/github.com/containernetworking/plugins export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" - export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" - - # Pass the needed cflags/ldflags so that cgo - # can find the needed headers files and libraries export CGO_ENABLED="1" - export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" - export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" cd ${S}/src/import/vendor/github.com/containernetworking/cni/libcni go build -- cgit v1.2.3-54-g00ecf