]> code.ossystems Code Review - openembedded-core.git/commitdiff
screen: Add patch to fix parallel make install
authorSaul Wold <sgw@linux.intel.com>
Sat, 15 Oct 2011 23:37:44 +0000 (16:37 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 17 Oct 2011 12:32:24 +0000 (13:32 +0100)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch [new file with mode: 0644]
meta/recipes-extended/screen/screen_4.0.3.bb

diff --git a/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch b/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
new file mode 100644 (file)
index 0000000..e0caf5d
--- /dev/null
@@ -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)
index 27f39ddfce5fca33db127f74fa00dabb880fa6c3..a875a3519f05d933d2b8663be5b5126dd4d42ea9 100644 (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"