summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-10-15 16:31:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-17 14:10:44 +0100
commit1c892e84bbe97415d5042b1c1d9b4ac8f756e041 (patch)
tree65b74f7f3179325f35c354baac1f941dcec80c04
parent576c8d181b8d702d4d6e754b3832dc2c34123257 (diff)
downloadpoky-1c892e84bbe97415d5042b1c1d9b4ac8f756e041.tar.gz
mktemp: Add patch to fix parallel make install
(From OE-Core rev: 28c7541582936c84b4c6f9de9a345d1463236167) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/mktemp/files/fix-parallel-make.patch23
-rw-r--r--meta/recipes-extended/mktemp/mktemp_1.7.bb3
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-extended/mktemp/files/fix-parallel-make.patch b/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
new file mode 100644
index 0000000000..8c693cc151
--- /dev/null
+++ b/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
@@ -0,0 +1,23 @@
1This fixes the parallel make install failure
2
3Upstream-Status: Pending
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7Index: mktemp-1.7/Makefile.in
8===================================================================
9--- mktemp-1.7.orig/Makefile.in
10+++ mktemp-1.7/Makefile.in
11@@ -94,10 +94,10 @@ install-dirs:
12 $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \
13 $(DESTDIR)$(mandir)/man1
14
15-install-binaries: $(PROG)
16+install-binaries: install-dirs $(PROG)
17 $(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG)
18
19-install-man:
20+install-man: install-dirs
21 $(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \
22 $(DESTDIR)$(mandir)/man1/mktemp.1
23
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index d0479ced2a..65f542ef00 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -5,10 +5,11 @@ SECTION = "console/utils"
5LICENSE = "ISC" 5LICENSE = "ISC"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
7 7
8PR = "r0" 8PR = "r1"
9 9
10SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \ 10SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
11 file://disable-strip.patch \ 11 file://disable-strip.patch \
12 file://fix-parallel-make.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "787bbed9fa2ee8e7645733c0e8e65172" 15SRC_URI[md5sum] = "787bbed9fa2ee8e7645733c0e8e65172"