summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/pcmciautils/pcmciautils-018
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-09 18:40:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:30 +0000
commit5d661c538d9a145463da568b792c778601a376d7 (patch)
treeba257da7aee484de5af2f1a2bb02263996154202 /meta/recipes-bsp/pcmciautils/pcmciautils-018
parent86795ffdde4a9cd0b3e2662f8e0c83cb212ee3ee (diff)
downloadpoky-5d661c538d9a145463da568b792c778601a376d7.tar.gz
pcmciautils: Fix parallel build and include sys/types.h
parallel build patch was removing dependencies on .c files mistakenly just adding src/yacc_config.h to dependencies in existing rule should have fixed the original build race include sys/types.h in lex_config.l for getting u_long definition (From OE-Core rev: 149a5202d32650775386e166ed06855097256977) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/pcmciautils/pcmciautils-018')
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch18
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch21
2 files changed, 28 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
29diff --git a/Makefile b/Makefile 29Index: pcmciautils-018/Makefile
30index 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--
441.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 @@
1Include sys/types.h for u_long definition
2
3Fix errors like
4In file included from src/lex_config.l:34:0:
5src/yacc_config.y:45:5: error: unknown type name 'u_long'
6 u_long num;
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Upstream-Status: Pending
10Index: 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>