diff options
-rw-r--r-- | meta/recipes-extended/at/at/fix_parallel_build_error.patch | 37 | ||||
-rw-r--r-- | meta/recipes-extended/at/at_3.2.4.bb (renamed from meta/recipes-extended/at/at_3.2.2.bb) | 24 |
2 files changed, 11 insertions, 50 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 deleted file mode 100644 index e4f32b82b6..0000000000 --- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 5 Dec 2018 09:46:22 +0800 | ||
4 | Subject: [PATCH] fix parallel build error | ||
5 | |||
6 | make -j was failing sometimesa like this | ||
7 | | 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 | ||
8 | | parsetime.l:5:19: fatal error: y.tab.h: No such file or directory | ||
9 | | compilation terminated. | ||
10 | | make: *** [lex.yy.o] Error 1 | ||
11 | | make: *** Waiting for unfinished jobs.... | ||
12 | |||
13 | Fixed the issue by adding a dependency in the makefile. | ||
14 | Nitin <nitin.a.kamble@intel.com> | ||
15 | 2010/09/02 | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
20 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
21 | --- | ||
22 | Makefile.in | 2 ++ | ||
23 | 1 file changed, 2 insertions(+) | ||
24 | |||
25 | Index: at-3.2.1/Makefile.in | ||
26 | =================================================================== | ||
27 | --- at-3.2.1.orig/Makefile.in | ||
28 | +++ at-3.2.1/Makefile.in | ||
29 | @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y | ||
30 | lex.yy.c: parsetime.l | ||
31 | $(LEX) -i parsetime.l | ||
32 | |||
33 | +parsetime.l: y.tab.h | ||
34 | + | ||
35 | atd.service: atd.service.in | ||
36 | cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ | ||
37 | |||
diff --git a/meta/recipes-extended/at/at_3.2.2.bb b/meta/recipes-extended/at/at_3.2.4.bb index 14b9dace2a..af8c3d6b4c 100644 --- a/meta/recipes-extended/at/at_3.2.2.bb +++ b/meta/recipes-extended/at/at_3.2.4.bb | |||
@@ -23,21 +23,20 @@ RCONFLICTS:${PN} = "atd" | |||
23 | RREPLACES:${PN} = "atd" | 23 | RREPLACES:${PN} = "atd" |
24 | 24 | ||
25 | SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ | 25 | SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ |
26 | file://fix_parallel_build_error.patch \ | 26 | file://posixtm.c \ |
27 | file://posixtm.c \ | 27 | file://posixtm.h \ |
28 | file://posixtm.h \ | 28 | file://file_replacement_with_gplv2.patch \ |
29 | file://file_replacement_with_gplv2.patch \ | 29 | file://atd.init \ |
30 | file://atd.init \ | 30 | file://atd.service \ |
31 | file://atd.service \ | 31 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
32 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 32 | file://makefile-fix-parallel.patch \ |
33 | file://makefile-fix-parallel.patch \ | 33 | file://0001-remove-glibc-assumption.patch \ |
34 | file://0001-remove-glibc-assumption.patch \ | 34 | " |
35 | " | ||
36 | 35 | ||
37 | PAM_SRC_URI = "file://pam.conf.patch \ | 36 | PAM_SRC_URI = "file://pam.conf.patch \ |
38 | file://configure-add-enable-pam.patch" | 37 | file://configure-add-enable-pam.patch" |
39 | 38 | ||
40 | SRC_URI[sha256sum] = "2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088" | 39 | SRC_URI[sha256sum] = "76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684" |
41 | 40 | ||
42 | EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ | 41 | EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ |
43 | --with-daemon_username=root \ | 42 | --with-daemon_username=root \ |
@@ -53,10 +52,9 @@ INITSCRIPT_PARAMS = "defaults" | |||
53 | 52 | ||
54 | SYSTEMD_SERVICE:${PN} = "atd.service" | 53 | SYSTEMD_SERVICE:${PN} = "atd.service" |
55 | 54 | ||
56 | copy_sources() { | 55 | do_configure:prepend() { |
57 | cp -f ${WORKDIR}/posixtm.[ch] ${S} | 56 | cp -f ${WORKDIR}/posixtm.[ch] ${S} |
58 | } | 57 | } |
59 | do_patch[postfuncs] += "copy_sources" | ||
60 | 58 | ||
61 | do_install () { | 59 | do_install () { |
62 | oe_runmake -e "IROOT=${D}" install | 60 | oe_runmake -e "IROOT=${D}" install |