screen: upgrade to 4.6.1

Removed following patch as the parallel make issue was fixed upstream:
 * fix-parallel-make.patch

(From OE-Core rev: 76c9ba6b3f7c0aecb00b7d9c0a1aace3f80d8b48)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John
2017-08-16 16:47:10 +03:00
committed by Richard Purdie
parent 391127b002
commit 3b2cb68524
2 changed files with 2 additions and 22 deletions

View File

@@ -1,19 +0,0 @@
This fixes the parallel make install failure
Upstream-Status: Pending
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: screen-4.0.3/Makefile.in
===================================================================
--- screen-4.0.3.orig/Makefile.in
+++ screen-4.0.3/Makefile.in
@@ -70,7 +70,7 @@ screen: $(OFILES)
.c.o:
$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
-install_bin: .version screen
+install_bin: .version screen installdirs
-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)

View File

@@ -16,7 +16,6 @@ DEPENDS = "ncurses \
RDEPENDS_${PN} = "base-files"
SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
file://fix-parallel-make.patch \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \
file://Remove-redundant-compiler-sanity-checks.patch \
file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \
@@ -26,8 +25,8 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
file://0001-fix-for-multijob-build.patch \
"
SRC_URI[md5sum] = "af60f716c4ec134712b923ef6cd93848"
SRC_URI[sha256sum] = "9433706b653e941cc4c745f28e252e57be2a141eded923e61cc2c4a09768fed4"
SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd"
SRC_URI[sha256sum] = "aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64"
inherit autotools texinfo