diff options
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch | 36 |
1 files changed, 36 insertions, 0 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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix makefile for multithreaded (make -j ) building. | ||
4 | |||
5 | btrfsctl.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 | |||
12 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
13 | 2012/01/02 | ||
14 | |||
15 | Index: 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 | ||