summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-31 13:24:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-01 11:20:18 +0000
commitb09b054ed837ba3bbe4de5544f7a1fbbbb8c54e0 (patch)
tree076f7084e37d505d3aa8afc053d7e87799623798 /meta
parent89df5f1a0ba06bc82ca05ac9099fa4db14d0a9b2 (diff)
downloadpoky-b09b054ed837ba3bbe4de5544f7a1fbbbb8c54e0.tar.gz
pcmciautils: Fix makefile race
The existing patch wasn't fixing one issue it claimed to and seemed incorrect in relation to the other. This patch correctly addresses the parallel make issue, as seen on our autobuilder. (From OE-Core rev: c2d14d584929cc7c4fe7d03643cf9b918e31bda6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch41
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch43
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils_018.bb2
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 @@
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
29Index: 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
3results in:
4
5src/lex_config.l:35:25: fatal error: yacc_config.h: No such file or directory
6
7so add missing dependency through a missing rule. Also remove a rule which
8doesn't appear to do anything.
9
10RP
112016/1/31
12
13Upstream-Status: Pending
14
15Index: 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
29Index: 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 @@
1require pcmciautils.inc 1require pcmciautils.inc
2 2
3SRC_URI += "file://makefile_fix.patch \ 3SRC_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