diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-11-08 22:49:17 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-22 02:01:06 +0100 |
| commit | a401b1044f6223c01a916a0e607135be970d1641 (patch) | |
| tree | ba8132bdd6b1fc39c6e3937e49163268f26dca30 | |
| parent | 27509acd9cdda16099baf97b178134bdd5253382 (diff) | |
snapd: fix build with update go infrastructure
go now has its own compile class. Use it and make it work.
snapd uses both autoconf and go, but the autoconf and go class compete
for the configure/compile class, so manually add what is additonally needed
for go.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | recipes-support/snapd/snapd_2.25.bb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/recipes-support/snapd/snapd_2.25.bb b/recipes-support/snapd/snapd_2.25.bb index 303dfee..7ea5349 100644 --- a/recipes-support/snapd/snapd_2.25.bb +++ b/recipes-support/snapd/snapd_2.25.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "accd4c94049ce79443ff995c27111f3851e9896bbad502dd5d341f8847 GO_IMPORT = "github.com/snapcore/snapd" DEPENDS += " \ - go-cross \ + virtual/${TARGET_PREFIX}go \ glib-2.0 \ python3-docutils-native \ udev \ @@ -36,7 +36,7 @@ EXTRA_OECONF += " \ --libexecdir=${libdir}/snapd \ " -inherit systemd autotools pkgconfig python3native go +inherit systemd go autotools pkgconfig python3native # Our tools build with autotools are inside the cmd subdirectory # and we need to tell the autotools class to look in there. @@ -47,6 +47,9 @@ SYSTEMD_SERVICE_${PN} = "snapd.service" do_configure_prepend() { (cd ${S} ; ./mkversion.sh ${PV}) } +do_configure_append() { + go_do_configure +} do_compile() { # Ensure we our component at the right place in our GOPATH @@ -54,7 +57,7 @@ do_compile() { ln -sf ${S} ${STAGING_LIBDIR}/${TARGET_SYS}/go/src/github.com/snapcore/snapd for d in snap snapd snap-exec snapctl; do - GOPATH=${STAGING_LIBDIR}/${TARGET_SYS}/go go build -x github.com/snapcore/snapd/cmd/$d + GOPATH=${STAGING_LIBDIR}/${TARGET_SYS}/go ${GO} build -x github.com/snapcore/snapd/cmd/$d done oe_runmake |