diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-01-28 02:00:57 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-14 22:26:09 +0000 |
| commit | 5ede7b9d3132801b9af76efb8612826af16d82f9 (patch) | |
| tree | cd5adb87a1481d08762f4bf11ce009c81b704631 | |
| parent | 3aa806eaae34ea6261816c5300ec4869ffc05c2e (diff) | |
| download | openembedded-core-contrib-5ede7b9d3132801b9af76efb8612826af16d82f9.tar.gz | |
at: fix and enable parallel build
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-extended/at/at/makefile-fix-parallel.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-extended/at/at_3.1.16.bb | 5 |
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 @@ +From 150b63a936af71b992a3a7b0fc2d2497e51fc800 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 28 Jan 2015 23:52:00 -0800 +Subject: [PATCH] Makefile: fix for parallel build + +Fixed: +y.tab.c:1001:0: error: unterminated #if + +Let "$(YACC) -d parsetime.y" only run once will fix the problem. + +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.in b/Makefile.in +index 2a9b918..aa7c04a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -75,7 +75,9 @@ at: $(ATOBJECTS) + atd: $(RUNOBJECTS) + $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) + +-y.tab.c y.tab.h: parsetime.y ++y.tab.h: y.tab.c ++ ++y.tab.c: parsetime.y + $(YACC) -d parsetime.y + + lex.yy.c: parsetime.l +-- +1.7.9.5 + 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 \ file://file_replacement_with_gplv2.patch \ file://atd.init \ file://atd.service \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://makefile-fix-parallel.patch \ + " PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" @@ -44,7 +46,6 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE_${PN} = "atd.service" -PARALLEL_MAKE = "" do_compile_prepend () { cp -f ${WORKDIR}/posixtm.[ch] ${S} |