diff options
Diffstat (limited to 'meta/recipes-extended/slang')
-rw-r--r-- | meta/recipes-extended/slang/slang/dont-link-to-host.patch | 23 | ||||
-rw-r--r-- | meta/recipes-extended/slang/slang/terminfo_fixes.patch | 32 | ||||
-rw-r--r-- | meta/recipes-extended/slang/slang_2.3.3.bb (renamed from meta/recipes-extended/slang/slang_2.3.2.bb) | 13 |
3 files changed, 51 insertions, 17 deletions
diff --git a/meta/recipes-extended/slang/slang/dont-link-to-host.patch b/meta/recipes-extended/slang/slang/dont-link-to-host.patch index 42dba0fae4..4b02068991 100644 --- a/meta/recipes-extended/slang/slang/dont-link-to-host.patch +++ b/meta/recipes-extended/slang/slang/dont-link-to-host.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From b4a6e3c8309cff0f2311cd959c5091213b633851 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Tue, 7 Feb 2017 14:35:43 +0000 | ||
4 | Subject: [PATCH] slang: rewrite recipe to run autoconf | ||
5 | |||
1 | SLANG_INST_LIB is the location of where slang will end up, but when building for | 6 | SLANG_INST_LIB is the location of where slang will end up, but when building for |
2 | packaging this doesn't have DESTDIR appended so can potentially link to the host | 7 | packaging this doesn't have DESTDIR appended so can potentially link to the host |
3 | for cross builds and will trigger QA errors. | 8 | for cross builds and will trigger QA errors. |
@@ -7,10 +12,20 @@ As this is obviously wrong, delete it. | |||
7 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 13 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
9 | 14 | ||
15 | --- | ||
16 | slsh/Makefile.in | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
10 | diff --git a/slsh/Makefile.in b/slsh/Makefile.in | 19 | diff --git a/slsh/Makefile.in b/slsh/Makefile.in |
11 | index cba9d81..4c1c370 100644 | 20 | index addd343..63a5c9b 100644 |
12 | --- a/slsh/Makefile.in | 21 | --- a/slsh/Makefile.in |
13 | +++ b/slsh/Makefile.in | 22 | +++ b/slsh/Makefile.in |
14 | @@ -80 +80 @@ SHELL = /bin/sh | 23 | @@ -77,7 +77,7 @@ SLSYSWRAP_LIB = @LIB_SLSYSWRAP@ |
15 | -INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS) | 24 | #---------------------------------------------------------------------------- |
16 | +INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS) | 25 | @SET_MAKE@ |
26 | SHELL = /bin/sh | ||
27 | -INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS) | ||
28 | +INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS) | ||
29 | DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \ | ||
30 | -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \ | ||
31 | -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF) | ||
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 @@ |
diff --git a/meta/recipes-extended/slang/slang_2.3.2.bb b/meta/recipes-extended/slang/slang_2.3.3.bb index 99efb16da6..05b8aff0f2 100644 --- a/meta/recipes-extended/slang/slang_2.3.2.bb +++ b/meta/recipes-extended/slang/slang_2.3.3.bb | |||
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.jedsoft.org/slang/" | |||
11 | SECTION = "libs" | 11 | SECTION = "libs" |
12 | DEPENDS = "ncurses virtual/libiconv" | 12 | DEPENDS = "ncurses virtual/libiconv" |
13 | 13 | ||
14 | LICENSE = "GPLv2" | 14 | LICENSE = "GPL-2.0-only" |
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" |
16 | 16 | ||
17 | SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ | 17 | SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ |
@@ -23,11 +23,10 @@ SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ | |||
23 | file://run-ptest \ | 23 | file://run-ptest \ |
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI[md5sum] = "c2d5a7aa0246627da490be4e399c87cb" | 26 | SRC_URI[sha256sum] = "f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18" |
27 | SRC_URI[sha256sum] = "fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a" | ||
28 | 27 | ||
29 | UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/" | 28 | UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/" |
30 | PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n" | 29 | PREMIRRORS:append = " http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/" |
31 | 30 | ||
32 | inherit autotools-brokensep ptest | 31 | inherit autotools-brokensep ptest |
33 | CLEANBROKEN = "1" | 32 | CLEANBROKEN = "1" |
@@ -42,7 +41,7 @@ PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_DIR_HOST}${prefix},--without-pcre,p | |||
42 | PACKAGECONFIG[png] = "--with-png=${STAGING_DIR_HOST}${prefix},--without-png,libpng" | 41 | PACKAGECONFIG[png] = "--with-png=${STAGING_DIR_HOST}${prefix},--without-png,libpng" |
43 | PACKAGECONFIG[zlib] = "--with-z=${STAGING_DIR_HOST}${prefix},--without-z,zlib" | 42 | PACKAGECONFIG[zlib] = "--with-z=${STAGING_DIR_HOST}${prefix},--without-z,zlib" |
44 | 43 | ||
45 | do_configure_prepend() { | 44 | do_configure:prepend() { |
46 | cd ${S}/autoconf | 45 | cd ${S}/autoconf |
47 | # slang keeps configure.ac and rest of autoconf files in autoconf/ directory | 46 | # slang keeps configure.ac and rest of autoconf files in autoconf/ directory |
48 | # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac} | 47 | # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac} |
@@ -74,9 +73,9 @@ do_install_ptest() { | |||
74 | sed -i 's/\.\.\/\.\.\/doc\/text\/slangfun\.txt/slangfun\.txt/' ${D}${PTEST_PATH}/test/docfun.sl | 73 | sed -i 's/\.\.\/\.\.\/doc\/text\/slangfun\.txt/slangfun\.txt/' ${D}${PTEST_PATH}/test/docfun.sl |
75 | } | 74 | } |
76 | 75 | ||
77 | FILES_${PN} += "${libdir}/${BPN}/v2/modules/ ${datadir}/slsh/" | 76 | FILES:${PN} += "${libdir}/${BPN}/v2/modules/ ${datadir}/slsh/" |
78 | 77 | ||
79 | RDEPENDS_${PN}-ptest += "make" | 78 | RDEPENDS:${PN}-ptest += "make" |
80 | 79 | ||
81 | PARALLEL_MAKE = "" | 80 | PARALLEL_MAKE = "" |
82 | PARALLEL_MAKEINST = "" | 81 | PARALLEL_MAKEINST = "" |