summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-02-05 01:48:41 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:27 +0000
commiteacb5c54cef58f6bc588a0436d810b4d94207e6e (patch)
treefa60b380a4f0b370ed7a8085e645f42e996e218b
parent8d30c2a0b3092e032382b103d9d010837fb75591 (diff)
downloadpoky-eacb5c54cef58f6bc588a0436d810b4d94207e6e.tar.gz
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>
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch35
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils.inc1
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils_018.bb4
3 files changed, 38 insertions, 2 deletions
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
new file mode 100644
index 0000000000..e9eaab780d
--- /dev/null
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
@@ -0,0 +1,35 @@
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
13Upstream-Status: Pending
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
16---
17 Makefile | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Makefile b/Makefile
21index d45fdc3..de2a5f9 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -246,7 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config
25 $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
26 $(QUIET) $(STRIPCMD) $@
27
28-yacc_config.o lex_config.o: %.o: %.c
29+yacc_config.o lex_config.o: %.o: %.c: %.h
30 $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
31
32 debugtools: ccdv $(CBDUMP) $(CISDUMP)
33--
341.7.9.5
35
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 04056e39c6..9d1c55bbad 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -23,7 +23,6 @@ LD = "${CC}"
23CFLAGS =+ "-I${S}/src" 23CFLAGS =+ "-I${S}/src"
24CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\"" 24CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\""
25 25
26PARALLEL_MAKE = ""
27EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'" 26EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
28 27
29do_install () { 28do_install () {
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
index 50629b4b14..fc76c44626 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -1,6 +1,8 @@
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 \
5"
4 6
5SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4" 7SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"
6SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5" 8SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5"