mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
slang: update 2.3.2 -> 2.3.3
(From OE-Core rev: 075d2b2442a7bbd41da1bba021b7008a7a77ec3a) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
222cf77268
commit
7089bc24b4
@@ -1,3 +1,8 @@
|
||||
From b4a6e3c8309cff0f2311cd959c5091213b633851 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Tue, 7 Feb 2017 14:35:43 +0000
|
||||
Subject: [PATCH] slang: rewrite recipe to run autoconf
|
||||
|
||||
SLANG_INST_LIB is the location of where slang will end up, but when building for
|
||||
packaging this doesn't have DESTDIR appended so can potentially link to the host
|
||||
for cross builds and will trigger QA errors.
|
||||
@@ -7,10 +12,20 @@ As this is obviously wrong, delete it.
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
---
|
||||
slsh/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/slsh/Makefile.in b/slsh/Makefile.in
|
||||
index cba9d81..4c1c370 100644
|
||||
index addd343..63a5c9b 100644
|
||||
--- a/slsh/Makefile.in
|
||||
+++ b/slsh/Makefile.in
|
||||
@@ -80 +80 @@ SHELL = /bin/sh
|
||||
-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
|
||||
+INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
|
||||
@@ -77,7 +77,7 @@ SLSYSWRAP_LIB = @LIB_SLSYSWRAP@
|
||||
#----------------------------------------------------------------------------
|
||||
@SET_MAKE@
|
||||
SHELL = /bin/sh
|
||||
-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
|
||||
+INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
|
||||
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
|
||||
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
|
||||
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF)
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
From 2a75095638002d37a2f9c7aeb0ec54f271b0a1c4 Mon Sep 17 00:00:00 2001
|
||||
From: Joe Slater <joe.slater@windriver.com>
|
||||
Date: Tue, 1 Aug 2017 12:36:53 -0700
|
||||
Subject: [PATCH] slang: fix terminfo related problems
|
||||
|
||||
Do not use the JD_TERMCAP macro since we cannot get the terminfo from
|
||||
ncurses pkg-config, but fix the macro to not reference host directories.
|
||||
Also add src/test/Makefile.in so that we can use -ltermcap if we want to.
|
||||
@@ -8,10 +13,18 @@ Upstream-Status: Inappropriate [see above]
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
---
|
||||
autoconf/aclocal.m4 | 8 +---
|
||||
autoconf/configure.ac | 11 +++++-
|
||||
src/test/Makefile.in | 90 +++++++++++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 100 insertions(+), 9 deletions(-)
|
||||
create mode 100644 src/test/Makefile.in
|
||||
|
||||
diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
|
||||
index b2dfcd3..5f94ed3 100644
|
||||
--- a/autoconf/aclocal.m4
|
||||
+++ b/autoconf/aclocal.m4
|
||||
@@ -506,14 +506,10 @@ then
|
||||
@@ -509,15 +509,9 @@ then
|
||||
else
|
||||
MISC_TERMINFO_DIRS=""
|
||||
fi
|
||||
@@ -19,8 +32,8 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
- /usr/lib/terminfo \
|
||||
- /usr/share/terminfo \
|
||||
- /usr/share/lib/terminfo \
|
||||
- /usr/local/lib/terminfo"
|
||||
+
|
||||
- /usr/local/lib/terminfo \
|
||||
- /etc/terminfo /lib/terminfo"
|
||||
TERMCAP=-ltermcap
|
||||
|
||||
-for terminfo_dir in $JD_Terminfo_Dirs
|
||||
@@ -28,9 +41,11 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
do
|
||||
if test -d $terminfo_dir
|
||||
then
|
||||
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
|
||||
index 8e11e13..9e6402c 100644
|
||||
--- a/autoconf/configure.ac
|
||||
+++ b/autoconf/configure.ac
|
||||
@@ -249,7 +249,14 @@ AC_CHECK_SIZEOF(size_t)
|
||||
@@ -250,7 +250,14 @@ AC_CHECK_SIZEOF(size_t)
|
||||
JD_CHECK_LONG_LONG
|
||||
JD_LARGE_FILE_SUPPORT
|
||||
|
||||
@@ -46,7 +61,7 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
JD_GCC_WARNINGS
|
||||
|
||||
JD_SET_OBJ_SRC_DIR(src)
|
||||
@@ -364,7 +371,7 @@ AC_CONFIG_HEADER(src/sysconf.h:src/confi
|
||||
@@ -365,7 +372,7 @@ AC_CONFIG_HEADER(src/sysconf.h:src/config.hin)
|
||||
dnl AC_CONFIG_SUBDIRS(demo)
|
||||
|
||||
AC_OUTPUT(Makefile:autoconf/Makefile.in \
|
||||
@@ -55,6 +70,9 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
slang.pc:autoconf/slangpc.in \
|
||||
)
|
||||
|
||||
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..4b7307f
|
||||
--- /dev/null
|
||||
+++ b/src/test/Makefile.in
|
||||
@@ -0,0 +1,90 @@
|
||||
|
||||
+1
-2
@@ -23,8 +23,7 @@ SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "c2d5a7aa0246627da490be4e399c87cb"
|
||||
SRC_URI[sha256sum] = "fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a"
|
||||
SRC_URI[sha256sum] = "f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18"
|
||||
|
||||
UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/"
|
||||
PREMIRRORS:append = " http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/"
|
||||
Reference in New Issue
Block a user