summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/screen/screen/fix-parallel-make.patch19
-rw-r--r--meta/recipes-extended/screen/screen_4.6.1.bb (renamed from meta/recipes-extended/screen/screen_4.6.0.bb)5
2 files changed, 2 insertions, 22 deletions
diff --git a/meta/recipes-extended/screen/screen/fix-parallel-make.patch b/meta/recipes-extended/screen/screen/fix-parallel-make.patch
deleted file mode 100644
index e0caf5d83e..0000000000
--- a/meta/recipes-extended/screen/screen/fix-parallel-make.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1This fixes the parallel make install failure
2
3Upstream-Status: Pending
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7Index: screen-4.0.3/Makefile.in
8===================================================================
9--- screen-4.0.3.orig/Makefile.in
10+++ screen-4.0.3/Makefile.in
11@@ -70,7 +70,7 @@ screen: $(OFILES)
12 .c.o:
13 $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
14
15-install_bin: .version screen
16+install_bin: .version screen installdirs
17 -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
18 then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
19 $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
diff --git a/meta/recipes-extended/screen/screen_4.6.0.bb b/meta/recipes-extended/screen/screen_4.6.1.bb
index a41efe929e..84baae9386 100644
--- a/meta/recipes-extended/screen/screen_4.6.0.bb
+++ b/meta/recipes-extended/screen/screen_4.6.1.bb
@@ -16,7 +16,6 @@ DEPENDS = "ncurses \
16RDEPENDS_${PN} = "base-files" 16RDEPENDS_${PN} = "base-files"
17 17
18SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ 18SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
19 file://fix-parallel-make.patch \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \
21 file://Remove-redundant-compiler-sanity-checks.patch \ 20 file://Remove-redundant-compiler-sanity-checks.patch \
22 file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \ 21 file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \
@@ -26,8 +25,8 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
26 file://0001-fix-for-multijob-build.patch \ 25 file://0001-fix-for-multijob-build.patch \
27 " 26 "
28 27
29SRC_URI[md5sum] = "af60f716c4ec134712b923ef6cd93848" 28SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd"
30SRC_URI[sha256sum] = "9433706b653e941cc4c745f28e252e57be2a141eded923e61cc2c4a09768fed4" 29SRC_URI[sha256sum] = "aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64"
31 30
32inherit autotools texinfo 31inherit autotools texinfo
33 32