Attachment #603546 for bug #705594

Lines 35-40 PATCHES=( Link Here

(-)a/sys-block/blktrace/blktrace-1.2.0.ebuild (+1 lines)
35	"${FILESDIR}"/${P}-overlapping-io-stats.patch	35	"${FILESDIR}"/${P}-overlapping-io-stats.patch
36	"${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741	36	"${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741
37	"${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741	37	"${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741
		38	"${FILESDIR}"/${PN}-1.2.0-parallel-rbtree.patch #705594
38	)	39	)
39		40
40	src_compile() {	41	src_compile() {

https://git.kernel.dk/cgit/blktrace/patch/?id=f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc

From f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc Mon Sep 17 00:00:00 2001
From: Gwendal Grignou <gwendal@chromium.org>
Date: Thu, 16 Jan 2020 12:33:26 -0800
Subject: fix parallel build of btt and blkiomon

rbtree.c is used by both binaries. It is possible that when make -C btt
is invoked rbtree.o does not exist yet, but is already schedule by the
compilation of blkiomon. That could result in recompiling rbtree.o again
for btt/btt.
In that case, at install time, make will recompile blkiomon which can
fail in gentoo, because CC variable is not overriden by ebuild script at
install time. (see https://bugs.gentoo.org/705594)

Add a dependency on SUBDIRS to wait for all binary in . to be compiled.
It will guarante rbtree.o exists.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5917814..eb3c6a1 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ all: $(ALL) $(SUBDIRS)

 # We always descend into subdirs because they contain their own dependency
 # information which we don't track in this top level Makefile.
-$(SUBDIRS):
+$(SUBDIRS): $(PROGS)
 	$(MAKE) -C $@
 .PHONY: $(SUBDIRS)

-- 
cgit v1.2.1-26-g8fc0

Return to bug 705594

Line 0 Link Here

(-)a/sys-block/blktrace/files/blktrace-1.2.0-parallel-rbtree.patch (-1 / +40 lines)
0	-	1	https://git.kernel.dk/cgit/blktrace/patch/?id=f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc
		2
		3	From f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc Mon Sep 17 00:00:00 2001
		4	From: Gwendal Grignou <gwendal@chromium.org>
		5	Date: Thu, 16 Jan 2020 12:33:26 -0800
		6	Subject: fix parallel build of btt and blkiomon
		7
		8	rbtree.c is used by both binaries. It is possible that when make -C btt
		9	is invoked rbtree.o does not exist yet, but is already schedule by the
		10	compilation of blkiomon. That could result in recompiling rbtree.o again
		11	for btt/btt.
		12	In that case, at install time, make will recompile blkiomon which can
		13	fail in gentoo, because CC variable is not overriden by ebuild script at
		14	install time. (see https://bugs.gentoo.org/705594)
		15
		16	Add a dependency on SUBDIRS to wait for all binary in . to be compiled.
		17	It will guarante rbtree.o exists.
		18
		19	Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
		20	Signed-off-by: Jens Axboe <axboe@kernel.dk>
		21	---
		22	Makefile \| 2 +-
		23	1 file changed, 1 insertion(+), 1 deletion(-)
		24
		25	diff --git a/Makefile b/Makefile
		26	index 5917814..eb3c6a1 100644
		27	--- a/Makefile
		28	+++ b/Makefile
		29	@@ -14,7 +14,7 @@ all: $(ALL) $(SUBDIRS)
		30
		31	# We always descend into subdirs because they contain their own dependency
		32	# information which we don't track in this top level Makefile.
		33	-$(SUBDIRS):
		34	+$(SUBDIRS): $(PROGS)
		35	$(MAKE) -C $@
		36	.PHONY: $(SUBDIRS)
		37
		38	--
		39	cgit v1.2.1-26-g8fc0
		40