-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sys-block/blktrace: Be sure rbtree is not compiled twice
Ensure all binaries are compiled on . before compiling other directory, as btt/btt and blkiomon need the same file, rbtree.o. Closes: https://bugs.gentoo.org/705594 Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
- Loading branch information
Showing
2 changed files
with
41 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
sys-block/blktrace/files/blktrace-1.2.0-parallel-rbtree.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
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 | ||
|