diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-11-12 16:36:54 +0000 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-11-12 16:55:41 +0000 |
commit | 857534f94308def5c014ad200312143f9a0e6e4c (patch) | |
tree | 50fc430737d09d63dad3fa166bdbdc37bfe0b3ef /meta/recipes-extended/procps | |
parent | 2e0ab8c18f1869a6fd1f53140fed0b4f3a1c3274 (diff) | |
download | openembedded-core-contrib-857534f94308def5c014ad200312143f9a0e6e4c.tar.gz |
procps: fix for build against make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/procps')
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch | 17 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps_3.2.7.bb | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch b/meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch new file mode 100644 index 00000000000..23310e05925 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch @@ -0,0 +1,17 @@ +Fix for stricter Makefile parser in Make 3.82 take from Gentoo bugzilla: +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-process/procps/files/procps-3.2.8%2Bgmake-3.82.patch?revision=1.1 + +Index: procps-3.2.8/Makefile +=================================================================== +--- procps-3.2.8.orig/Makefile ++++ procps-3.2.8/Makefile +@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) + # want this rule first, use := on ALL, and ALL not filled in yet + all: do_all + +--include */module.mk ++-include proc/module.mk ++-include ps/module.mk + + do_all: $(ALL) + diff --git a/meta/recipes-extended/procps/procps_3.2.7.bb b/meta/recipes-extended/procps/procps_3.2.7.bb index b795c2b36a4..470352553c0 100644 --- a/meta/recipes-extended/procps/procps_3.2.7.bb +++ b/meta/recipes-extended/procps/procps_3.2.7.bb @@ -1,6 +1,6 @@ require procps.inc -PR = "r9" +PR = "r10" inherit update-rc.d update-alternatives @@ -16,6 +16,7 @@ SRC_URI += "file://procmodule.patch;patch=1 \ file://linux-limits.patch;patch=1 \ file://sysctl.conf \ file://procps.init \ + file://procps-3.2.8+gmake-3.82.patch \ " FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ |