diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-10-15 16:37:44 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-17 13:32:24 +0100 |
| commit | 96a46957ea37f090c934c6ad446076111661a7c2 (patch) | |
| tree | b62e735bb0144062db598fddfccd8b4a25b2cec8 /meta | |
| parent | 28c7541582936c84b4c6f9de9a345d1463236167 (diff) | |
| download | openembedded-core-96a46957ea37f090c934c6ad446076111661a7c2.tar.gz openembedded-core-96a46957ea37f090c934c6ad446076111661a7c2.tar.bz2 openembedded-core-96a46957ea37f090c934c6ad446076111661a7c2.tar.xz openembedded-core-96a46957ea37f090c934c6ad446076111661a7c2.zip | |
screen: Add patch to fix parallel make install
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-extended/screen/screen_4.0.3.bb | 3 |
2 files changed, 21 insertions, 1 deletions
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 index 000000000..e0caf5d83 --- /dev/null +++ b/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch @@ -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) diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb index 27f39ddfc..a875a3519 100644 --- a/meta/recipes-extended/screen/screen_4.0.3.bb +++ b/meta/recipes-extended/screen/screen_4.0.3.bb @@ -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" |