summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-01-02 11:29:30 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:40 +0000
commit8eb45acf307e5f30678b4725969e03b5e3f52b4e (patch)
treea0c47ab7f068a3db1734c8993f50fc27e966974a
parent761acbb4fa3ec8bec8e099e544495280a950e1de (diff)
downloadpoky-8eb45acf307e5f30678b4725969e03b5e3f52b4e.tar.gz
btrfs-tools:Fix multithreaded building
Fixes bug: [YOCTO #1524] Fixes this error with make -j: btrfsctl.c | i586-poky-linux-gcc -m32 -march=i586 --sysroot=/intel/poky/builds/world/tmp/sysroots/qemux86 -Wp,-MMD,./.btrfsctl.o.d,-MT,btrfsctl.o -Wall -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -O2 -pipe -g -feliminate-unused-debug-types -c btrfsctl.c | btrfsctl.c:37:21: fatal error: version.h: No such file or directory | compilation terminated. | btrfslabel.c:40:21: fatal error: version.h: No such file or directory | compilation terminated. (From OE-Core rev: 3ebc06c2f011da95fd6bed74c9e27b2148011ee7) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch36
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb6
2 files changed, 40 insertions, 2 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch
new file mode 100644
index 0000000000..40175b8ffa
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch
@@ -0,0 +1,36 @@
1Upstream-Status: Pending
2
3Fix makefile for multithreaded (make -j ) building.
4
5btrfsctl.c
6| i586-poky-linux-gcc -m32 -march=i586 --sysroot=/intel/poky/builds/world/tmp/sysroots/qemux86 -Wp,-MMD,./.btrfsctl.o.d,-MT,btrfsctl.o -Wall -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -O2 -pipe -g -feliminate-unused-debug-types -c btrfsctl.c
7| btrfsctl.c:37:21: fatal error: version.h: No such file or directory
8| compilation terminated.
9| btrfslabel.c:40:21: fatal error: version.h: No such file or directory
10| compilation terminated.
11
12Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
132012/01/02
14
15Index: git/Makefile
16===================================================================
17--- git.orig/Makefile
18+++ git/Makefile
19@@ -26,14 +26,13 @@ else
20 check = ls
21 endif
22
23-.c.o:
24+%.o: %.c version.h
25 $(check) $<
26 $(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $<
27
28+all: $(progs) manpages
29
30-all: version $(progs) manpages
31-
32-version:
33+version.h: version.sh
34 bash version.sh
35
36 btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index b2e503bda6..58049e5f78 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -16,10 +16,12 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;p
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
18 18
19PR = "r4" 19PR = "r5"
20 20
21SRC_URI += " file://fix_use_of_gcc.patch \ 21SRC_URI += " file://fix_use_of_gcc.patch \
22 file://weak-defaults.patch " 22 file://weak-defaults.patch \
23 file://fix_race_condition_with_multithreaded_make.patch "
24
23SRC_URI[md5sum] = "78b1700d318de8518abfaab71f99a885" 25SRC_URI[md5sum] = "78b1700d318de8518abfaab71f99a885"
24SRC_URI[sha256sum] = "1285774e0cb72984fac158dd046c8d405324754febd30320cd31e459253e4b65" 26SRC_URI[sha256sum] = "1285774e0cb72984fac158dd046c8d405324754febd30320cd31e459253e4b65"
25 27