screen: Add patch to fix parallel make install

(From OE-Core rev: 96a46957ea37f090c934c6ad446076111661a7c2)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2011-10-15 16:37:44 -07:00 committed by Richard Purdie
parent 1c892e84bb
commit 601077f7bd
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,19 @@
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

@ -12,11 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0774d66808b0f602e94448108f59448b \
SECTION = "console/utils"
DEPENDS = "ncurses \
${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
PR = "r1"
PR = "r2"
SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \
${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-11+lenny1.diff.gz;name=patch \
file://configure.patch \
file://fix-parallel-make.patch \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
PAM_SRC_URI = "file://screen.pam"