summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-03-29 19:50:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-15 18:12:43 +0100
commitc6269fbbc4f4ccd305345d125611b69172a34cd8 (patch)
tree2ffc4e79f7dd4205428477d6cdf861fd45093d3e /meta
parent52c03366ec319fcabab9bb75f8b78520728c0104 (diff)
downloadpoky-c6269fbbc4f4ccd305345d125611b69172a34cd8.tar.gz
pcmciautils: fix for parallel build
Fixed: Compiling lex_config.c. src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory There was a patch for fixing the paralle issue before, so modify the patch again. (From OE-Core master rev: e1193feb30fbbfacb430ccbb9f33cd782f7cb87d) (From OE-Core rev: 0907c61d7b9ad892ae815d68393ed2e30881e289) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
index e9eaab780d..c9a7ada408 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
@@ -10,6 +10,10 @@ Fixed:
10| ^ 10| ^
11| compilation terminated. 11| compilation terminated.
12 12
13And:
14Compiling lex_config.c.
15 src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory
16
13Upstream-Status: Pending 17Upstream-Status: Pending
14 18
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
@@ -18,14 +22,16 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18 1 file changed, 1 insertion(+), 1 deletion(-) 22 1 file changed, 1 insertion(+), 1 deletion(-)
19 23
20diff --git a/Makefile b/Makefile 24diff --git a/Makefile b/Makefile
21index d45fdc3..de2a5f9 100644 25index d45fdc3..d4ffd7e 100644
22--- a/Makefile 26--- a/Makefile
23+++ b/Makefile 27+++ b/Makefile
24@@ -246,7 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config 28@@ -246,7 +246,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config
25 $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) 29 $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
26 $(QUIET) $(STRIPCMD) $@ 30 $(QUIET) $(STRIPCMD) $@
27 31
28-yacc_config.o lex_config.o: %.o: %.c 32-yacc_config.o lex_config.o: %.o: %.c
33+lex_config.o: yacc_config.h
34+
29+yacc_config.o lex_config.o: %.o: %.c: %.h 35+yacc_config.o lex_config.o: %.o: %.c: %.h
30 $(CC) -c -MD -O -pipe $(CPPFLAGS) $< 36 $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
31 37