aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/at/at/fix_parallel_build_error.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-12-05 16:40:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 22:30:15 +0000
commit30fa97ec4c9d0553f1566bc26a6949e93cb6da90 (patch)
treebfa79d2be2514f550f6875ecbd4bb01ddb92c9a4 /meta/recipes-extended/at/at/fix_parallel_build_error.patch
parentaf912ac17f406ff11319eb33bc0d3910bcea39ef (diff)
downloadopenembedded-core-contrib-30fa97ec4c9d0553f1566bc26a6949e93cb6da90.tar.gz
openembedded-core-contrib-30fa97ec4c9d0553f1566bc26a6949e93cb6da90.tar.bz2
openembedded-core-contrib-30fa97ec4c9d0553f1566bc26a6949e93cb6da90.zip
at: upgrade to 3.1.23
The following patches are rebased. fix_parallel_build_error.patch pam.conf.patch Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/at/at/fix_parallel_build_error.patch')
-rw-r--r--meta/recipes-extended/at/at/fix_parallel_build_error.patch15
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/meta/recipes-extended/at/at/fix_parallel_build_error.patch
index 100f8898e0..30d2324126 100644
--- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch
+++ b/meta/recipes-extended/at/at/fix_parallel_build_error.patch
@@ -1,3 +1,8 @@
+From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Wed, 5 Dec 2018 09:46:22 +0800
+Subject: [PATCH] fix parallel build error
+
make -j was failing sometimesa like this
| ccache i586-poky-linux-gcc -march=i586 --sysroot=/home/nitin/build/build0/tmp/sysroots/i586-poky-linux -I. -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -o atd atd.o daemon.o -lfl -lpam -Wl,-O1 -Wl,--as-needed
| parsetime.l:5:19: fatal error: y.tab.h: No such file or directory
@@ -12,24 +17,24 @@ Nitin <nitin.a.kamble@intel.com>
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
Makefile.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Makefile.in b/Makefile.in
-index dd3c2f8..7897e45 100644
+index 4c11913..18ecc23 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -82,6 +82,8 @@ y.tab.c y.tab.h: parsetime.y
+@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y
lex.yy.c: parsetime.l
$(LEX) -i parsetime.l
+parsetime.l: y.tab.h
+
atd.service: atd.service.in
- sed -e 's![@]sbindir[@]!$(sbindir)!g' < $< > $@
+ cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@
--
-1.9.1
+2.7.4