[meta-virtualization] [PATCH V2 1/3] cni: remove unnecessary GO settings
Chen Qi
Qi.Chen at windriver.com
Sun Aug 11 19:33:11 PDT 2019
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 <Qi.Chen at windriver.com>
---
recipes-networking/cni/cni_git.bb | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index d07154b..266ee69 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
--
2.17.1
More information about the meta-virtualization
mailing list