summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch45
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch41
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils_018.bb2
3 files changed, 46 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
new file mode 100644
index 0000000000..7b010400f7
--- /dev/null
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch
@@ -0,0 +1,45 @@
1From 5a793a1a9fb3477719aabf7e27ff22ed1acdf559 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Tue, 19 May 2015 15:54:24 +0800
4Subject: [PATCH] fix a parallel building issue
5
6Fixed:
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
13And:
14Compiling lex_config.c.
15 src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory
16
17Upstream-Status: Pending
18
19there are two Makefile rules to generate lex_config.o, one is to generate
20lex_config.o other is to generate src/lex_config.o, so we can remove one.
21and add the needed dependence for lex_config.o
22
23
24Signed-off-by: Roy Li <rongqing.li@windriver.com>
25---
26 Makefile | 3 +--
27 1 file changed, 1 insertion(+), 2 deletions(-)
28
29diff --git a/Makefile b/Makefile
30index d45fdc3..4c53bc2 100644
31--- a/Makefile
32+++ b/Makefile
33@@ -246,8 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config
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/yacc_config.h
40
41 debugtools: ccdv $(CBDUMP) $(CISDUMP)
42
43--
441.9.1
45
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
deleted file mode 100644
index d0bb3d6f1a..0000000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 1b8ad348f8c712c8e0c16c49cc1c8e577e4d6d3e Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 5 Feb 2015 01:16:30 -0800
4Subject: [PATCH] Makefile: fix for parallel build
5
6Fixed:
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
13And:
14Compiling lex_config.c.
15 src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory
16
17Upstream-Status: Pending
18
19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
20---
21 Makefile | 4 +++-
22 1 file changed, 3 insertions(+), 1 deletion(-)
23
24diff --git a/Makefile b/Makefile
25index d45fdc3..963453a 100644
26--- a/Makefile
27+++ b/Makefile
28@@ -246,7 +246,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config
29 $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
30 $(QUIET) $(STRIPCMD) $@
31
32-yacc_config.o lex_config.o: %.o: %.c
33+lex_config.o: lex_config.c yacc_config.h
34+ $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
35+yacc_config.o: yacc_config.c
36 $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
37
38 debugtools: ccdv $(CBDUMP) $(CISDUMP)
39--
401.7.9.5
41
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
index fc76c44626..24ceed87a9 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -1,7 +1,7 @@
1require pcmciautils.inc 1require pcmciautils.inc
2 2
3SRC_URI += "file://makefile_fix.patch \ 3SRC_URI += "file://makefile_fix.patch \
4 file://Makefile-fix-for-parallel-build.patch \ 4 file://0001-fix-a-parallel-building-issue.patch \
5" 5"
6 6
7SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4" 7SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"