merged. Bruce
In message: [meta-virtualization] [PATCH 2/2] netns: Fix build on qemux86-64 on 24/09/2019 Paul Barker wrote: > The build has broken again on master, even for non-static builds of > netns. The simplest fix is to extend our existing patch to cover this > case as well. > > Signed-off-by: Paul Barker <[email protected]> > --- > ...ce-rebuilding-all-packages-to-avoid-cgo.patch | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git > a/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch > > b/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch > index 3ed4c21..e4967d2 100644 > --- > a/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch > +++ > b/recipes-networking/netns/files/Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch > @@ -37,14 +37,20 @@ Forward-ported to v0.5.3. > > Signed-off-by: Paul Barker <[email protected]> > --- > - basic.mk | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > + basic.mk | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/basic.mk b/basic.mk > -index 187dff3..fb080b7 100644 > +index 187dff3..76a8d93 100644 > --- a/src/import/basic.mk > +++ b/src/import/basic.mk > -@@ -50,7 +50,7 @@ $(NAME): $(wildcard *.go) $(wildcard */*.go) VERSION.txt > +@@ -45,12 +45,12 @@ build: prebuild $(NAME) ## Builds a dynamic executable > or package. > + > + $(NAME): $(wildcard *.go) $(wildcard */*.go) VERSION.txt > + @echo "+ $@" > +- $(GO) build -tags "$(BUILDTAGS)" ${GO_LDFLAGS} -o $(NAME) . > ++ $(GO) build -a -pkgdir dontusecurrentpkgs -tags "$(BUILDTAGS)" > ${GO_LDFLAGS} -o $(NAME) . > + > .PHONY: static > static: prebuild ## Builds a static executable. > @echo "+ $@" > @@ -54,5 +60,5 @@ index 187dff3..fb080b7 100644 > ${GO_LDFLAGS_STATIC} -o $(NAME) . > > -- > -2.17.1 > +2.23.0 > > -- > 2.23.0 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
