Attachment #603544 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() {




commit 817bd67f206b325f4494f1f86d970c2f76a3b794
Author: Gwendal Grignou <gwendal@chromium.org>
Date:   Thu Jan 16 12:12:57 2020 -0800

    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>

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)
 

Return to bug 705594

Line 0 Link Here

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