summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-28 02:00:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:26 +0000
commit208c9d39d736d5a1ae6072b7597706d91478e7b9 (patch)
tree03c03ecc357e159e9b94c6dc4ad415f969cc5fcc /meta/recipes-extended
parent5c87de13cb539c27dd448f70c589877e0a65a87b (diff)
downloadpoky-208c9d39d736d5a1ae6072b7597706d91478e7b9.tar.gz
at: fix and enable parallel build
(From OE-Core rev: 5ede7b9d3132801b9af76efb8612826af16d82f9) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/at/at/makefile-fix-parallel.patch35
-rw-r--r--meta/recipes-extended/at/at_3.1.16.bb5
2 files changed, 38 insertions, 2 deletions
diff --git a/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/meta/recipes-extended/at/at/makefile-fix-parallel.patch
new file mode 100644
index 0000000000..932a4c0bfe
--- /dev/null
+++ b/meta/recipes-extended/at/at/makefile-fix-parallel.patch
@@ -0,0 +1,35 @@
1From 150b63a936af71b992a3a7b0fc2d2497e51fc800 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 28 Jan 2015 23:52:00 -0800
4Subject: [PATCH] Makefile: fix for parallel build
5
6Fixed:
7y.tab.c:1001:0: error: unterminated #if
8
9Let "$(YACC) -d parsetime.y" only run once will fix the problem.
10
11Upstream-Status: Pending
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 Makefile | 4 +++-
16 1 file changed, 3 insertions(+), 1 deletion(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index 2a9b918..aa7c04a 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -75,7 +75,9 @@ at: $(ATOBJECTS)
23 atd: $(RUNOBJECTS)
24 $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
25
26-y.tab.c y.tab.h: parsetime.y
27+y.tab.h: y.tab.c
28+
29+y.tab.c: parsetime.y
30 $(YACC) -d parsetime.y
31
32 lex.yy.c: parsetime.l
33--
341.7.9.5
35
diff --git a/meta/recipes-extended/at/at_3.1.16.bb b/meta/recipes-extended/at/at_3.1.16.bb
index f16edba5eb..cee9fde967 100644
--- a/meta/recipes-extended/at/at_3.1.16.bb
+++ b/meta/recipes-extended/at/at_3.1.16.bb
@@ -22,7 +22,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
22 file://file_replacement_with_gplv2.patch \ 22 file://file_replacement_with_gplv2.patch \
23 file://atd.init \ 23 file://atd.init \
24 file://atd.service \ 24 file://atd.service \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 25 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
26 file://makefile-fix-parallel.patch \
27 "
26 28
27PAM_SRC_URI = "file://pam.conf.patch \ 29PAM_SRC_URI = "file://pam.conf.patch \
28 file://configure-add-enable-pam.patch" 30 file://configure-add-enable-pam.patch"
@@ -44,7 +46,6 @@ INITSCRIPT_PARAMS = "defaults"
44 46
45SYSTEMD_SERVICE_${PN} = "atd.service" 47SYSTEMD_SERVICE_${PN} = "atd.service"
46 48
47PARALLEL_MAKE = ""
48 49
49do_compile_prepend () { 50do_compile_prepend () {
50 cp -f ${WORKDIR}/posixtm.[ch] ${S} 51 cp -f ${WORKDIR}/posixtm.[ch] ${S}