diff options
-rw-r--r-- | recipes-networking/cni/cni_git.bb | 18 |
1 files changed, 0 insertions, 18 deletions
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 | |||
29 | inherit goarch | 29 | inherit goarch |
30 | 30 | ||
31 | do_compile() { | 31 | do_compile() { |
32 | export GOARCH="${TARGET_GOARCH}" | ||
33 | export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" | ||
34 | export GOPATH="${S}/src/import:${S}/src/import/vendor" | ||
35 | |||
36 | # Pass the needed cflags/ldflags so that cgo | ||
37 | # can find the needed headers files and libraries | ||
38 | export CGO_ENABLED="1" | ||
39 | export CFLAGS="" | ||
40 | export LDFLAGS="" | ||
41 | export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" | ||
42 | export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" | ||
43 | |||
44 | # link fixups for compilation | 32 | # link fixups for compilation |
45 | rm -f ${S}/src/import/vendor/src | 33 | rm -f ${S}/src/import/vendor/src |
46 | mkdir -p ${S}/src/import/vendor/ | 34 | mkdir -p ${S}/src/import/vendor/ |
@@ -56,13 +44,7 @@ do_compile() { | |||
56 | ln -sf ${WORKDIR}/plugins ${S}/src/import/vendor/github.com/containernetworking/plugins | 44 | ln -sf ${WORKDIR}/plugins ${S}/src/import/vendor/github.com/containernetworking/plugins |
57 | 45 | ||
58 | export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" | 46 | export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" |
59 | export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" | ||
60 | |||
61 | # Pass the needed cflags/ldflags so that cgo | ||
62 | # can find the needed headers files and libraries | ||
63 | export CGO_ENABLED="1" | 47 | export CGO_ENABLED="1" |
64 | export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" | ||
65 | export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" | ||
66 | 48 | ||
67 | cd ${S}/src/import/vendor/github.com/containernetworking/cni/libcni | 49 | cd ${S}/src/import/vendor/github.com/containernetworking/cni/libcni |
68 | go build | 50 | go build |