sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Khem Raj 2016-01-09 18:40:09 -08:00 committed by Richard Purdie
parent 86795ffdde
commit 5d661c538d
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch
View File

@ -26,20 +26,16 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index d45fdc3..4c53bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -246,8 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config
Index: pcmciautils-018/Makefile
===================================================================
--- pcmciautils-018.orig/Makefile
+++ pcmciautils-018/Makefile
@@ -246,7 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
-yacc_config.o lex_config.o: %.o: %.c
- $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
+src/lex_config.o:src/yacc_config.h
+yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h
$(CC) -c -MD -O -pipe $(CPPFLAGS) $<
debugtools: ccdv $(CBDUMP) $(CISDUMP)
--
1.9.1

21
meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch Normal file
View File

@ -0,0 +1,21 @@
Include sys/types.h for u_long definition
Fix errors like
In file included from src/lex_config.l:34:0:
src/yacc_config.y:45:5: error: unknown type name 'u_long'
u_long num;
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: pcmciautils-018/src/lex_config.l
===================================================================
--- pcmciautils-018.orig/src/lex_config.l
+++ pcmciautils-018/src/lex_config.l
@@ -22,6 +22,7 @@
#include <unistd.h>
#include <string.h>
#include <syslog.h>
+#include <sys/types.h>
#ifdef HAS_WORDEXP
#include <wordexp.h>

1
meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
View File

@ -2,6 +2,7 @@ require pcmciautils.inc
SRC_URI += "file://makefile_fix.patch \
file://0001-fix-a-parallel-building-issue.patch \
file://lex_sys_types.patch \
"
SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"