btrfs-tools: Fix parallel make issue

btrfs-tools was failing occasionally due to version.h being missing. This
fixes the problems, thanks to several people on #yocto for helping out
why my lack of make knowledge of old fashioned suffix rules :)

(From OE-Core rev: 7be8010186889cece97829025d97d94f21c1f2e5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-09-20 16:12:50 +00:00
parent 5262ea16a6
commit f427614108
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,27 @@
btrfs-progs: Fix parallel build
Upstream-Status: Pending
"make btrfs.o" fails unable to find version.h.
This adds version.h as a dependency for all .o files and fixes various parallel
build failures.
RP 20/9/2013
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: git/Makefile
===================================================================
--- git.orig/Makefile 2013-09-20 14:45:34.307723221 +0000
+++ git/Makefile 2013-09-20 16:06:45.503611030 +0000
@@ -76,7 +76,7 @@
check = true
endif
-.c.o:
+%.o: %.c version.h
$(Q)$(check) $<
@echo " [CC] $@"
$(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $<

View File

@ -21,6 +21,7 @@ PV = "0.20+git${SRCPV}"
SRC_URI += "file://weak-defaults.patch"
SRC_URI += "file://btrfs-progs-fix-parallel-build.patch"
SRC_URI += "file://btrfs-progs-fix-parallel-build2.patch"
do_install () {
oe_runmake 'DESTDIR=${D}' install