diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch | 58 | ||||
-rw-r--r-- | meta/recipes-extended/screen/screen_4.4.0.bb | 1 |
2 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch new file mode 100644 index 0000000000..fbdb0eb478 --- /dev/null +++ b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Tue, 26 Jul 2016 14:23:59 +0800 | ||
4 | Subject: [PATCH] fix for multijob build | ||
5 | |||
6 | make sure that comm.sh script generates comm.h header before doing | ||
7 | anything else | ||
8 | |||
9 | Signed-off-by: Amadeusz Sawiski <amade@asmblr.net> | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Backport patch to fix parallel build failure and update context to make patch | ||
14 | coulde be applied. | ||
15 | |||
16 | http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd | ||
17 | |||
18 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
19 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
20 | --- | ||
21 | Makefile.in | 8 ++++---- | ||
22 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
23 | |||
24 | diff --git a/Makefile.in b/Makefile.in | ||
25 | index aca7da3..3607711 100644 | ||
26 | --- a/Makefile.in | ||
27 | +++ b/Makefile.in | ||
28 | @@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a | ||
29 | comm.h layer.h term.h image.h display.h window.h mark.h extern.h | ||
30 | tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ | ||
31 | layer.h term.h image.h display.h window.h extern.h | ||
32 | -term.o: layout.h viewport.h canvas.h term.c term.h | ||
33 | +term.o: layout.h viewport.h canvas.h term.c term.h comm.h | ||
34 | window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \ | ||
35 | comm.h layer.h term.h image.h display.h window.h extern.h logfile.h | ||
36 | utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \ | ||
37 | @@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a | ||
38 | comm.h layer.h term.h image.h display.h window.h extern.h \ | ||
39 | braille.h | ||
40 | comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h | ||
41 | -kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h | ||
42 | +kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h | ||
43 | acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ | ||
44 | layer.h term.h image.h display.h window.h extern.h | ||
45 | braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \ | ||
46 | @@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a | ||
47 | viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ | ||
48 | comm.h layer.h term.h image.h display.h window.h extern.h \ | ||
49 | braille.h | ||
50 | -list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h | ||
51 | -list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h | ||
52 | +list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h | ||
53 | +list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h | ||
54 | list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h | ||
55 | |||
56 | -- | ||
57 | 1.9.1 | ||
58 | |||
diff --git a/meta/recipes-extended/screen/screen_4.4.0.bb b/meta/recipes-extended/screen/screen_4.4.0.bb index e970c5b0fc..769bac162b 100644 --- a/meta/recipes-extended/screen/screen_4.4.0.bb +++ b/meta/recipes-extended/screen/screen_4.4.0.bb | |||
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ | |||
23 | file://Skip-host-file-system-checks-when-cross-compiling.patch \ | 23 | file://Skip-host-file-system-checks-when-cross-compiling.patch \ |
24 | file://Avoid-mis-identifying-systems-as-SVR4.patch \ | 24 | file://Avoid-mis-identifying-systems-as-SVR4.patch \ |
25 | file://0002-comm.h-now-depends-on-term.h.patch \ | 25 | file://0002-comm.h-now-depends-on-term.h.patch \ |
26 | file://0001-fix-for-multijob-build.patch \ | ||
26 | " | 27 | " |
27 | 28 | ||
28 | SRC_URI[md5sum] = "d26e11a3648c2b11aaefa215a55dfd39" | 29 | SRC_URI[md5sum] = "d26e11a3648c2b11aaefa215a55dfd39" |