summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-09-22 15:24:08 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-09-22 15:24:08 +0000
commitd5554764b202e673c2b116d7f3525d8ac2442578 (patch)
treeef9628f4fc3b58558d10535155f522da1a3e0e05 /sys-process/procps
parentBump to 0.98, reported by Chainsaw (diff)
downloadgentoo-2-d5554764b202e673c2b116d7f3525d8ac2442578.tar.gz
gentoo-2-d5554764b202e673c2b116d7f3525d8ac2442578.tar.bz2
gentoo-2-d5554764b202e673c2b116d7f3525d8ac2442578.zip
Add patch that should fix bug #333299 (procps failing to build with gmake 3.82).
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'sys-process/procps')
-rw-r--r--sys-process/procps/ChangeLog7
-rw-r--r--sys-process/procps/files/procps-3.2.8+gmake-3.82.patch14
-rw-r--r--sys-process/procps/procps-3.2.8-r1.ebuild3
3 files changed, 22 insertions, 2 deletions
diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 21443ec7d61d..b5d02fe6d124 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-process/procps
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.39 2010/01/25 03:06:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.40 2010/09/22 15:24:08 flameeyes Exp $
+
+ 22 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ procps-3.2.8-r1.ebuild, +files/procps-3.2.8+gmake-3.82.patch:
+ Add patch that should fix bug #333299 (procps failing to build with gmake
+ 3.82).
*procps-3.2.8-r1 (25 Jan 2010)
diff --git a/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch b/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch
new file mode 100644
index 000000000000..87ab13ea4461
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch
@@ -0,0 +1,14 @@
+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/sys-process/procps/procps-3.2.8-r1.ebuild b/sys-process/procps/procps-3.2.8-r1.ebuild
index a8f02945953e..2cb94e3ed0c7 100644
--- a/sys-process/procps/procps-3.2.8-r1.ebuild
+++ b/sys-process/procps/procps-3.2.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r1.ebuild,v 1.1 2010/01/25 03:06:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r1.ebuild,v 1.2 2010/09/22 15:24:08 flameeyes Exp $
inherit flag-o-matic eutils toolchain-funcs multilib
@@ -23,6 +23,7 @@ src_unpack() {
epatch "${FILESDIR}"/procps-3.2.7-proc-mount.patch
epatch "${FILESDIR}"/procps-3.2.3-noproc.patch
epatch "${FILESDIR}"/procps-3.2.8-toprc-fixup.patch
+ epatch "${FILESDIR}"/procps-3.2.8+gmake-3.82.patch
# Clean up the makefile
# - we do stripping ourselves