diff options
-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 0000000000..e0caf5d83e --- /dev/null +++ b/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | This fixes the parallel make install failure | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: 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.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb index 27f39ddfce..a875a3519f 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 \ | |||
12 | SECTION = "console/utils" | 12 | SECTION = "console/utils" |
13 | DEPENDS = "ncurses \ | 13 | DEPENDS = "ncurses \ |
14 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 14 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
15 | PR = "r1" | 15 | PR = "r2" |
16 | 16 | ||
17 | SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \ | 17 | SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \ |
18 | ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-11+lenny1.diff.gz;name=patch \ | 18 | ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-11+lenny1.diff.gz;name=patch \ |
19 | file://configure.patch \ | 19 | file://configure.patch \ |
20 | file://fix-parallel-make.patch \ | ||
20 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" | 21 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" |
21 | 22 | ||
22 | PAM_SRC_URI = "file://screen.pam" | 23 | PAM_SRC_URI = "file://screen.pam" |