I'm going to keep this change as-is. The structure of the linkeshared building in buildah isn't well done, and the build -> rm -> build again is strange (to say the least).
Bruce On Mon, Mar 27, 2023 at 4:21 AM Jose Quaresma <[email protected]> wrote: > > The linkshared is fixed upstream and backported in oe-core. > https://git.yoctoproject.org/poky/commit/?id=d5c79ca6a77af1a04992fff4300333e02d94d84d > > Signed-off-by: Jose Quaresma <[email protected]> > --- > recipes-containers/buildah/buildah_git.bb | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/recipes-containers/buildah/buildah_git.bb > b/recipes-containers/buildah/buildah_git.bb > index 3c17c98..af340eb 100644 > --- a/recipes-containers/buildah/buildah_git.bb > +++ b/recipes-containers/buildah/buildah_git.bb > @@ -40,9 +40,15 @@ do_compile:prepend() { > go_do_compile() { > export TMPDIR="${GOTMPDIR}" > if [ -n "${GO_INSTALL}" ]; then > - ${GO} install ${GOBUILDFLAGS} ./cmd/buildah > - ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go > - ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go > + if [ -n "${GO_LINKSHARED}" ]; then > + ${GO} install ${GOBUILDFLAGS} ./cmd/buildah > + ${GO} install ${GOBUILDFLAGS} > ./tests/imgtype/imgtype.go > + ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go > + rm -rf ${B}/bin > + fi > + ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./cmd/buildah > + ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} > ./tests/imgtype/imgtype.go > + ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} > ./tests/copy/copy.go > fi > } > > -- > 2.34.1 > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7958): https://lists.yoctoproject.org/g/meta-virtualization/message/7958 Mute This Topic: https://lists.yoctoproject.org/mt/97877470/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
