summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-09-08 16:15:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:27:54 +0100
commite384b970adcf0a742240fbbdf5b2b81b938ed0a9 (patch)
tree5fdd373c9cc8509e980f3dcc5c2eb585ccff066d
parent69b7a613fc8404bef6ef20a8d480303d1e6ddab2 (diff)
downloadpoky-e384b970adcf0a742240fbbdf5b2b81b938ed0a9.tar.gz
screen: backport to fix build error
It fails to compile screen rarely with: |.../4.3.1-r0/screen-4.3.1/display.h:154:19: error: 'T_N' undeclared here (not in a function) | union tcu d_tcs[T_N]; /* terminal capabilities */ | ^ Macro T_N is defined in header file term.h but it may not be created then fails. Backport patch to make sure term.h is created before compile other source codes. (From OE-Core rev: 81499ff3bd60dfa931fbae75922a342c31251480) 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/0002-comm.h-now-depends-on-term.h.patch33
-rw-r--r--meta/recipes-extended/screen/screen_4.3.1.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch b/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
new file mode 100644
index 0000000000..b5d71cc1b4
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
@@ -0,0 +1,33 @@
1Upstream-Status: Backport
2
3Backport from:
4
5http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8---
9From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001
10From: Mike Gerwitz <mike@mikegerwitz.com>
11Date: Tue, 24 Dec 2013 22:16:31 -0500
12Subject: [PATCH] comm.h now depends on term.h
13
14---
15 src/Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/Makefile.in b/src/Makefile.in
19index e791e79..d4f7c0b 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -113,7 +113,7 @@ term.h: term.c term.sh
23
24 kmapdef.c: term.h
25
26-comm.h: comm.c comm.sh config.h
27+comm.h: comm.c comm.sh config.h term.h
28 AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
29
30 docs:
31--
322.4.1
33
diff --git a/meta/recipes-extended/screen/screen_4.3.1.bb b/meta/recipes-extended/screen/screen_4.3.1.bb
index 6aea56db09..92457af171 100644
--- a/meta/recipes-extended/screen/screen_4.3.1.bb
+++ b/meta/recipes-extended/screen/screen_4.3.1.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://0001-fix-for-multijob-build.patch \ 25 file://0001-fix-for-multijob-build.patch \
26 file://0002-comm.h-now-depends-on-term.h.patch \
26 " 27 "
27 28
28SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad" 29SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad"