diff options
| author | Kai Kang <kai.kang@windriver.com> | 2015-09-08 16:15:12 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-09 14:25:08 +0100 |
| commit | 81499ff3bd60dfa931fbae75922a342c31251480 (patch) | |
| tree | 72d8e85169b268782768159a2c50f2762613e205 /meta | |
| parent | 1687ec04bfee327fe24fdfecb67db689835769f2 (diff) | |
| download | openembedded-core-81499ff3bd60dfa931fbae75922a342c31251480.tar.gz openembedded-core-81499ff3bd60dfa931fbae75922a342c31251480.tar.bz2 openembedded-core-81499ff3bd60dfa931fbae75922a342c31251480.zip | |
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.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-extended/screen/screen_4.3.1.bb | 1 |
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 @@ +Upstream-Status: Backport + +Backport from: + +http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 +From: Mike Gerwitz <mike@mikegerwitz.com> +Date: Tue, 24 Dec 2013 22:16:31 -0500 +Subject: [PATCH] comm.h now depends on term.h + +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index e791e79..d4f7c0b 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -113,7 +113,7 @@ term.h: term.c term.sh + + kmapdef.c: term.h + +-comm.h: comm.c comm.sh config.h ++comm.h: comm.c comm.sh config.h term.h + AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh + + docs: +-- +2.4.1 + 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 \ file://Skip-host-file-system-checks-when-cross-compiling.patch \ file://Avoid-mis-identifying-systems-as-SVR4.patch \ file://0001-fix-for-multijob-build.patch \ + file://0002-comm.h-now-depends-on-term.h.patch \ " SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad" |