mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 12:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

pcmciautils: fix the parallel building issue

Browse Source 
The building failure still display after upstream commit 055a5bbfc[
pcmciautils: fix for parallel build], so refix it.

(From OE-Core rev: fb426a1f5a103a1dc096977533dfbec2aefe07ae)

(From OE-Core rev: 14b5556ad3a4d7e817442e004b73601041f31b69)

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Roy Li
2015-05-19 16:38:11 +08:00
committed by Richard Purdie
parent 86bf04ca9b
commit 71676e587f
3 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,45 @@
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(-)
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
$(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
debugtools: ccdv $(CBDUMP) $(CISDUMP)
--
1.9.1

41
meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
View File

@@ -1,41 +0,0 @@
From 1b8ad348f8c712c8e0c16c49cc1c8e577e4d6d3e Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 5 Feb 2015 01:16:30 -0800
Subject: [PATCH] Makefile: fix for parallel build
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
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index d45fdc3..963453a 100644
--- a/Makefile
+++ b/Makefile
@@ -246,7 +246,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config
$(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
+lex_config.o: lex_config.c yacc_config.h
+ $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
+yacc_config.o: yacc_config.c
$(CC) -c -MD -O -pipe $(CPPFLAGS) $<
debugtools: ccdv $(CBDUMP) $(CISDUMP)
--
1.7.9.5

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

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