blktrace: Fix parallel make issue
Fixes [BUGID #581] When PARALLEL_MAKE is used with the current blktrace Makefile, the btreplay and btrecord object files can end up being built multiple times in parallel, which occasionally causes the linker to pick up the object files in intermediate and seemingly corrupt states, and causes the spurious link errors in the bug report. This fix restricts the recursive btreplay invocations to building only btreplay or btrecord as appropriate, not both. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
This commit is contained in:
parent
6ee0c26e21
commit
3156e757f2
|
@ -17,11 +17,11 @@ Index: git/Makefile
|
|||
|
||||
btreplay/btrecord:
|
||||
- $(MAKE) -C btreplay
|
||||
+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}"
|
||||
+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btrecord
|
||||
|
||||
btreplay/btreplay:
|
||||
- $(MAKE) -C btreplay
|
||||
+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}"
|
||||
+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btreplay
|
||||
|
||||
%.o: %.c
|
||||
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
||||
|
|
|
@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
|
|||
|
||||
DEPENDS = "libaio"
|
||||
|
||||
PR = r0
|
||||
PR = r1
|
||||
PV = "1.0.1+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \
|
||||
|
|
Loading…
Reference in New Issue