[poky] [PATCH 05/14] procps: fix for build against make 3.82

Joshua Lock josh at linux.intel.com
Wed Dec 15 08:28:51 PST 2010


Signed-off-by: Joshua Lock <josh at linux.intel.com>
---
 .../procps-3.2.7/procps-3.2.8+gmake-3.82.patch     |   17 +++++++++++++++++
 meta/recipes-extended/procps/procps_3.2.7.bb       |    3 ++-
 2 files changed, 19 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch

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 0000000..23310e0
--- /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 b795c2b..4703525 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} \
-- 
1.7.3.3




More information about the poky mailing list