diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-31 13:24:56 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-01 11:20:18 +0000 |
commit | b09b054ed837ba3bbe4de5544f7a1fbbbb8c54e0 (patch) | |
tree | 076f7084e37d505d3aa8afc053d7e87799623798 /meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch | |
parent | 89df5f1a0ba06bc82ca05ac9099fa4db14d0a9b2 (diff) | |
download | poky-b09b054ed837ba3bbe4de5544f7a1fbbbb8c54e0.tar.gz |
pcmciautils: Fix makefile race
The existing patch wasn't fixing one issue it claimed to and seemed
incorrect in relation to the other.
This patch correctly addresses the parallel make issue, as seen on
our autobuilder.
(From OE-Core rev: c2d14d584929cc7c4fe7d03643cf9b918e31bda6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch')
-rw-r--r-- | meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch new file mode 100644 index 0000000000..f5a518ff73 --- /dev/null +++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | "make src/lex_config.o" | ||
2 | |||
3 | results in: | ||
4 | |||
5 | src/lex_config.l:35:25: fatal error: yacc_config.h: No such file or directory | ||
6 | |||
7 | so add missing dependency through a missing rule. Also remove a rule which | ||
8 | doesn't appear to do anything. | ||
9 | |||
10 | RP | ||
11 | 2016/1/31 | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Index: pcmciautils-018/Makefile | ||
16 | =================================================================== | ||
17 | --- pcmciautils-018.orig/Makefile | ||
18 | +++ pcmciautils-018/Makefile | ||
19 | @@ -249,6 +249,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st | ||
20 | yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h | ||
21 | $(CC) -c -MD -O -pipe $(CPPFLAGS) $< | ||
22 | |||
23 | +src/lex_config.o : src/lex_config.c src/yacc_config.h | ||
24 | + $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
25 | + | ||
26 | debugtools: ccdv $(CBDUMP) $(CISDUMP) | ||
27 | |||
28 | $(CBDUMP): $(LIBC) debug/cbdump.o | ||
29 | Index: pcmciautils-018/Makefile | ||
30 | =================================================================== | ||
31 | --- pcmciautils-018.orig/Makefile | ||
32 | +++ pcmciautils-018/Makefile | ||
33 | @@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st | ||
34 | $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) | ||
35 | $(QUIET) $(STRIPCMD) $@ | ||
36 | |||
37 | -yacc_config.o lex_config.o: %.o: %.c | ||
38 | - $(CC) -c -MD -O -pipe $(CPPFLAGS) $< | ||
39 | +src/lex_config.o : src/lex_config.c src/yacc_config.h ccdv | ||
40 | + $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
41 | |||
42 | debugtools: ccdv $(CBDUMP) $(CISDUMP) | ||
43 | |||