diff options
3 files changed, 29 insertions, 11 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 index 7b010400f7..3125df481c 100644 --- 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 | |||
@@ -26,20 +26,16 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
26 | Makefile | 3 +-- | 26 | Makefile | 3 +-- |
27 | 1 file changed, 1 insertion(+), 2 deletions(-) | 27 | 1 file changed, 1 insertion(+), 2 deletions(-) |
28 | 28 | ||
29 | diff --git a/Makefile b/Makefile | 29 | Index: pcmciautils-018/Makefile |
30 | index d45fdc3..4c53bc2 100644 | 30 | =================================================================== |
31 | --- a/Makefile | 31 | --- pcmciautils-018.orig/Makefile |
32 | +++ b/Makefile | 32 | +++ pcmciautils-018/Makefile |
33 | @@ -246,8 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config | 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) | 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) $@ | 35 | $(QUIET) $(STRIPCMD) $@ |
36 | 36 | ||
37 | -yacc_config.o lex_config.o: %.o: %.c | 37 | -yacc_config.o lex_config.o: %.o: %.c |
38 | - $(CC) -c -MD -O -pipe $(CPPFLAGS) $< | 38 | +yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h |
39 | +src/lex_config.o:src/yacc_config.h | 39 | $(CC) -c -MD -O -pipe $(CPPFLAGS) $< |
40 | 40 | ||
41 | debugtools: ccdv $(CBDUMP) $(CISDUMP) | 41 | debugtools: ccdv $(CBDUMP) $(CISDUMP) |
42 | |||
43 | -- | ||
44 | 1.9.1 | ||
45 | |||
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch new file mode 100644 index 0000000000..d4c2bed15c --- /dev/null +++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Include sys/types.h for u_long definition | ||
2 | |||
3 | Fix errors like | ||
4 | In file included from src/lex_config.l:34:0: | ||
5 | src/yacc_config.y:45:5: error: unknown type name 'u_long' | ||
6 | u_long num; | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | Upstream-Status: Pending | ||
10 | Index: pcmciautils-018/src/lex_config.l | ||
11 | =================================================================== | ||
12 | --- pcmciautils-018.orig/src/lex_config.l | ||
13 | +++ pcmciautils-018/src/lex_config.l | ||
14 | @@ -22,6 +22,7 @@ | ||
15 | #include <unistd.h> | ||
16 | #include <string.h> | ||
17 | #include <syslog.h> | ||
18 | +#include <sys/types.h> | ||
19 | |||
20 | #ifdef HAS_WORDEXP | ||
21 | #include <wordexp.h> | ||
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb index 6a1c366b8e..5c340813cd 100644 --- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb +++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | |||
@@ -2,6 +2,7 @@ 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://0001-fix-a-parallel-building-issue.patch \ |
5 | file://lex_sys_types.patch \ | ||
5 | " | 6 | " |
6 | 7 | ||
7 | SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4" | 8 | SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4" |