summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-08-27 17:28:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-03 12:43:21 +0100
commit275fc5f2209c58a666bd031488d8a12da28b257f (patch)
tree524b52591a088fa61baa71c7c8538ea8ebfdcdfd
parent3dd8c75b6738a15e7b70203321d62b49fd095739 (diff)
downloadpoky-275fc5f2209c58a666bd031488d8a12da28b257f.tar.gz
screen: fix parallel build failure
Backport patch to fix screen parallel build failure. (From OE-Core rev: 3d68d24d6da70606c7dd68eaa6442c84f53941d7) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch58
-rw-r--r--meta/recipes-extended/screen/screen_4.3.1.bb4
2 files changed, 61 insertions, 1 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..40ecef00bd
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
@@ -0,0 +1,58 @@
1Upstream-Status: Backport
2
3Backport patch to fix parallel build failure and update context to make patch
4coulde be applied.
5
6http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd
7
8Signed-off-by: Kai Kang <kai.kang@windriver.com>
9---
10From c0de6dd7970b2c7b426a5c39dcbc31c2bef87232 Mon Sep 17 00:00:00 2001
11From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
12Date: Thu, 2 Jan 2014 18:18:06 +0100
13Subject: [PATCH] fix for multijob build
14MIME-Version: 1.0
15Content-Type: text/plain; charset=UTF-8
16Content-Transfer-Encoding: 8bit
17
18make sure that comm.sh script generates comm.h header before doing
19anything else
20
21Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
22---
23 Makefile.in | 10 +++++-----
24 1 file changed, 5 insertions(+), 5 deletions(-)
25
26diff --git a/Makefile.in b/Makefile.in
27index ce86cbc..dea16d8 100644
28--- a/Makefile.in
29+++ b/Makefile.in
30@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a
31 comm.h layer.h term.h image.h display.h window.h mark.h extern.h
32 tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
33 layer.h term.h image.h display.h window.h extern.h
34-term.o: layout.h viewport.h canvas.h term.c term.h
35+term.o: layout.h viewport.h canvas.h term.c term.h comm.h
36 window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \
37 comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
38 utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \
39@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a
40 comm.h layer.h term.h image.h display.h window.h extern.h \
41 braille.h
42 comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h
43-kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h
44+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h
45 acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
46 layer.h term.h image.h display.h window.h extern.h
47 braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \
48@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a
49 viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
50 comm.h layer.h term.h image.h display.h window.h extern.h \
51 braille.h
52-list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
53-list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
54-list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h
55+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h
56+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h
57+list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
58
diff --git a/meta/recipes-extended/screen/screen_4.3.1.bb b/meta/recipes-extended/screen/screen_4.3.1.bb
index f95578b510..6aea56db09 100644
--- a/meta/recipes-extended/screen/screen_4.3.1.bb
+++ b/meta/recipes-extended/screen/screen_4.3.1.bb
@@ -21,7 +21,9 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
21 file://Remove-redundant-compiler-sanity-checks.patch \ 21 file://Remove-redundant-compiler-sanity-checks.patch \
22 file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \ 22 file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \
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://0001-fix-for-multijob-build.patch \
26 "
25 27
26SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad" 28SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad"
27SRC_URI[sha256sum] = "fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63" 29SRC_URI[sha256sum] = "fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63"