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

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>
This commit is contained in:
Richard Purdie 2016-01-31 13:24:56 +00:00
parent 89df5f1a0b
commit b09b054ed8
3 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,41 +0,0 @@
From 5a793a1a9fb3477719aabf7e27ff22ed1acdf559 Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Tue, 19 May 2015 15:54:24 +0800
Subject: [PATCH] fix a parallel building issue
Fixed:
| src/lex_config.c:34:25: fatal error: yacc_config.h: No such file or directory
|
| #include "yacc_config.h"
| ^
| compilation terminated.
And:
Compiling lex_config.c.
src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory
Upstream-Status: Pending
there are two Makefile rules to generate lex_config.o, one is to generate
lex_config.o other is to generate src/lex_config.o, so we can remove one.
and add the needed dependence for lex_config.o
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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
+yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h
$(CC) -c -MD -O -pipe $(CPPFLAGS) $<
debugtools: ccdv $(CBDUMP) $(CISDUMP)

43
meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch Normal file
View File

@ -0,0 +1,43 @@
"make src/lex_config.o"
results in:
src/lex_config.l:35:25: fatal error: yacc_config.h: No such file or directory
so add missing dependency through a missing rule. Also remove a rule which
doesn't appear to do anything.
RP
2016/1/31
Upstream-Status: Pending
Index: pcmciautils-018/Makefile
===================================================================
--- pcmciautils-018.orig/Makefile
+++ pcmciautils-018/Makefile
@@ -249,6 +249,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h
$(CC) -c -MD -O -pipe $(CPPFLAGS) $<
+src/lex_config.o : src/lex_config.c src/yacc_config.h
+ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
debugtools: ccdv $(CBDUMP) $(CISDUMP)
$(CBDUMP): $(LIBC) debug/cbdump.o
Index: pcmciautils-018/Makefile
===================================================================
--- pcmciautils-018.orig/Makefile
+++ pcmciautils-018/Makefile
@@ -246,8 +246,8 @@ $(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/lex_config.c src/yacc_config.h ccdv
+ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
debugtools: ccdv $(CBDUMP) $(CISDUMP)

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

@ -1,7 +1,7 @@
require pcmciautils.inc
SRC_URI += "file://makefile_fix.patch \
file://0001-fix-a-parallel-building-issue.patch \
file://makefile_race.patch \
file://lex_sys_types.patch \
"