diff options
3 files changed, 44 insertions, 42 deletions
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch deleted file mode 100644 index 3125df481c..0000000000 --- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 5a793a1a9fb3477719aabf7e27ff22ed1acdf559 Mon Sep 17 00:00:00 2001 | ||
2 | From: Roy Li <rongqing.li@windriver.com> | ||
3 | Date: Tue, 19 May 2015 15:54:24 +0800 | ||
4 | Subject: [PATCH] fix a parallel building issue | ||
5 | |||
6 | Fixed: | ||
7 | | src/lex_config.c:34:25: fatal error: yacc_config.h: No such file or directory | ||
8 | | | ||
9 | | #include "yacc_config.h" | ||
10 | | ^ | ||
11 | | compilation terminated. | ||
12 | |||
13 | And: | ||
14 | Compiling lex_config.c. | ||
15 | src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | there are two Makefile rules to generate lex_config.o, one is to generate | ||
20 | lex_config.o other is to generate src/lex_config.o, so we can remove one. | ||
21 | and add the needed dependence for lex_config.o | ||
22 | |||
23 | |||
24 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
25 | --- | ||
26 | Makefile | 3 +-- | ||
27 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
28 | |||
29 | Index: pcmciautils-018/Makefile | ||
30 | =================================================================== | ||
31 | --- pcmciautils-018.orig/Makefile | ||
32 | +++ pcmciautils-018/Makefile | ||
33 | @@ -246,7 +246,7 @@ $(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 | +yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h | ||
39 | $(CC) -c -MD -O -pipe $(CPPFLAGS) $< | ||
40 | |||
41 | debugtools: ccdv $(CBDUMP) $(CISDUMP) | ||
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 | |||
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb index 5c340813cd..d3dde7e041 100644 --- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb +++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require pcmciautils.inc | 1 | require pcmciautils.inc |
2 | 2 | ||
3 | SRC_URI += "file://makefile_fix.patch \ | 3 | SRC_URI += "file://makefile_fix.patch \ |
4 | file://0001-fix-a-parallel-building-issue.patch \ | 4 | file://makefile_race.patch \ |
5 | file://lex_sys_types.patch \ | 5 | file://lex_sys_types.patch \ |
6 | " | 6 | " |
7 | 7 | ||