summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
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:10:52 +0000
commit3ebc06c2f011da95fd6bed74c9e27b2148011ee7 (patch)
tree101544e5a2a0663f7b01081e5a6b1ef0a2f32fbe /meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
parent2dffe02af05413d8438ddc28d542dc5d85ac105f (diff)
downloadopenembedded-core-3ebc06c2f011da95fd6bed74c9e27b2148011ee7.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. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb6
1 files changed, 4 insertions, 2 deletions
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
S = "${WORKDIR}/git"
-PR = "r4"
+PR = "r5"
SRC_URI += " file://fix_use_of_gcc.patch \
- file://weak-defaults.patch "
+ file://weak-defaults.patch \
+ file://fix_race_condition_with_multithreaded_make.patch "
+
SRC_URI[md5sum] = "78b1700d318de8518abfaab71f99a885"
SRC_URI[sha256sum] = "1285774e0cb72984fac158dd046c8d405324754febd30320cd31e459253e4b65"