pcmciautils: fix and enable parallel build
(From OE-Core rev: 2f7ae00803bec32dabb75ece86b6d4a858e512d1) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8d30c2a0b3
commit
eacb5c54ce
|
@ -0,0 +1,35 @@
|
||||||
|
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.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index d45fdc3..de2a5f9 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -246,7 +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
|
||||||
|
+yacc_config.o lex_config.o: %.o: %.c: %.h
|
||||||
|
$(CC) -c -MD -O -pipe $(CPPFLAGS) $<
|
||||||
|
|
||||||
|
debugtools: ccdv $(CBDUMP) $(CISDUMP)
|
||||||
|
--
|
||||||
|
1.7.9.5
|
||||||
|
|
|
@ -23,7 +23,6 @@ LD = "${CC}"
|
||||||
CFLAGS =+ "-I${S}/src"
|
CFLAGS =+ "-I${S}/src"
|
||||||
CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\""
|
CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\""
|
||||||
|
|
||||||
PARALLEL_MAKE = ""
|
|
||||||
EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
|
EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
|
||||||
|
|
||||||
do_install () {
|
do_install () {
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require pcmciautils.inc
|
require pcmciautils.inc
|
||||||
|
|
||||||
SRC_URI += "file://makefile_fix.patch"
|
SRC_URI += "file://makefile_fix.patch \
|
||||||
|
file://Makefile-fix-for-parallel-build.patch \
|
||||||
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"
|
SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"
|
||||||
SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5"
|
SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5"
|
||||||
|
|
Loading…
Reference in New Issue