diff options
Diffstat (limited to 'meta/recipes-extended/slang/slang/terminfo_fixes.patch')
-rw-r--r-- | meta/recipes-extended/slang/slang/terminfo_fixes.patch | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/meta/recipes-extended/slang/slang/terminfo_fixes.patch b/meta/recipes-extended/slang/slang/terminfo_fixes.patch index 3e6d15aa79..331b7f02e4 100644 --- a/meta/recipes-extended/slang/slang/terminfo_fixes.patch +++ b/meta/recipes-extended/slang/slang/terminfo_fixes.patch | |||
@@ -1,15 +1,30 @@ | |||
1 | From 2a75095638002d37a2f9c7aeb0ec54f271b0a1c4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Tue, 1 Aug 2017 12:36:53 -0700 | ||
4 | Subject: [PATCH] slang: fix terminfo related problems | ||
5 | |||
1 | Do not use the JD_TERMCAP macro since we cannot get the terminfo from | 6 | Do not use the JD_TERMCAP macro since we cannot get the terminfo from |
2 | ncurses pkg-config, but fix the macro to not reference host directories. | 7 | ncurses pkg-config, but fix the macro to not reference host directories. |
3 | Also add src/test/Makefile.in so that we can use -ltermcap if we want to. | 8 | Also add src/test/Makefile.in so that we can use -ltermcap if we want to. |
4 | 9 | ||
5 | Upstream-Status: Pending | 10 | Upstream isn't going to take this, as it forces blank values and |
11 | removes functionality without replacing it. | ||
12 | Upstream-Status: Inappropriate [see above] | ||
6 | 13 | ||
7 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 14 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
8 | 15 | ||
16 | --- | ||
17 | autoconf/aclocal.m4 | 8 +--- | ||
18 | autoconf/configure.ac | 11 +++++- | ||
19 | src/test/Makefile.in | 90 +++++++++++++++++++++++++++++++++++++++++++ | ||
20 | 3 files changed, 100 insertions(+), 9 deletions(-) | ||
21 | create mode 100644 src/test/Makefile.in | ||
9 | 22 | ||
23 | diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4 | ||
24 | index b2dfcd3..5f94ed3 100644 | ||
10 | --- a/autoconf/aclocal.m4 | 25 | --- a/autoconf/aclocal.m4 |
11 | +++ b/autoconf/aclocal.m4 | 26 | +++ b/autoconf/aclocal.m4 |
12 | @@ -506,14 +506,10 @@ then | 27 | @@ -509,15 +509,9 @@ then |
13 | else | 28 | else |
14 | MISC_TERMINFO_DIRS="" | 29 | MISC_TERMINFO_DIRS="" |
15 | fi | 30 | fi |
@@ -17,8 +32,8 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
17 | - /usr/lib/terminfo \ | 32 | - /usr/lib/terminfo \ |
18 | - /usr/share/terminfo \ | 33 | - /usr/share/terminfo \ |
19 | - /usr/share/lib/terminfo \ | 34 | - /usr/share/lib/terminfo \ |
20 | - /usr/local/lib/terminfo" | 35 | - /usr/local/lib/terminfo \ |
21 | + | 36 | - /etc/terminfo /lib/terminfo" |
22 | TERMCAP=-ltermcap | 37 | TERMCAP=-ltermcap |
23 | 38 | ||
24 | -for terminfo_dir in $JD_Terminfo_Dirs | 39 | -for terminfo_dir in $JD_Terminfo_Dirs |
@@ -26,9 +41,11 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
26 | do | 41 | do |
27 | if test -d $terminfo_dir | 42 | if test -d $terminfo_dir |
28 | then | 43 | then |
44 | diff --git a/autoconf/configure.ac b/autoconf/configure.ac | ||
45 | index 8e11e13..9e6402c 100644 | ||
29 | --- a/autoconf/configure.ac | 46 | --- a/autoconf/configure.ac |
30 | +++ b/autoconf/configure.ac | 47 | +++ b/autoconf/configure.ac |
31 | @@ -249,7 +249,14 @@ AC_CHECK_SIZEOF(size_t) | 48 | @@ -250,7 +250,14 @@ AC_CHECK_SIZEOF(size_t) |
32 | JD_CHECK_LONG_LONG | 49 | JD_CHECK_LONG_LONG |
33 | JD_LARGE_FILE_SUPPORT | 50 | JD_LARGE_FILE_SUPPORT |
34 | 51 | ||
@@ -44,7 +61,7 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
44 | JD_GCC_WARNINGS | 61 | JD_GCC_WARNINGS |
45 | 62 | ||
46 | JD_SET_OBJ_SRC_DIR(src) | 63 | JD_SET_OBJ_SRC_DIR(src) |
47 | @@ -364,7 +371,7 @@ AC_CONFIG_HEADER(src/sysconf.h:src/confi | 64 | @@ -365,7 +372,7 @@ AC_CONFIG_HEADER(src/sysconf.h:src/config.hin) |
48 | dnl AC_CONFIG_SUBDIRS(demo) | 65 | dnl AC_CONFIG_SUBDIRS(demo) |
49 | 66 | ||
50 | AC_OUTPUT(Makefile:autoconf/Makefile.in \ | 67 | AC_OUTPUT(Makefile:autoconf/Makefile.in \ |
@@ -53,6 +70,9 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
53 | slang.pc:autoconf/slangpc.in \ | 70 | slang.pc:autoconf/slangpc.in \ |
54 | ) | 71 | ) |
55 | 72 | ||
73 | diff --git a/src/test/Makefile.in b/src/test/Makefile.in | ||
74 | new file mode 100644 | ||
75 | index 0000000..4b7307f | ||
56 | --- /dev/null | 76 | --- /dev/null |
57 | +++ b/src/test/Makefile.in | 77 | +++ b/src/test/Makefile.in |
58 | @@ -0,0 +1,90 @@ | 78 | @@ -0,0 +1,90 @@ |