Added patch for mips that sets the value of PAGE_SIZE via a call to sysconf due to changes in mips-headers.

5 files changed, 47 insertions, 18 deletions

diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index 3ecf9c77c7d2..32a97c6e1ea3 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/procps
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.75 2004/08/10 16:32:12 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.76 2004/08/13 00:40:42 kumba Exp $
+
+  12 Aug 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/procps-mips-define-pagesize.patch, procps-3.2.2-r1.ebuild,
+  procps-3.2.3.ebuild:
+  Added patch for mips that sets the value of PAGE_SIZE via a call to sysconf
+  due to changes in mips-headers.
 
 *procps-3.2.3 (10 Aug 2004)
 
diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest
index 03b7f6dc0b08..90d75fbd6f79 100644
--- a/sys-apps/procps/Manifest
+++ b/sys-apps/procps/Manifest
@@ -1,22 +1,23 @@
-MD5 1a12a945ea2a7fdb7103644d22d4cb82 procps-3.1.15.ebuild 1236
-MD5 8eae8fbe8949b39d3853f794f920e348 procps-3.2.1.ebuild 1149
+MD5 0978dbe99e09196b91c8b3cf3bc7b71a ChangeLog 12115
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 e3b3f57a3f6f7e586cd3a23a5689cc30 procps-2.0.16-r1.ebuild 2002
-MD5 33e38176f73dbb6b7ddaed4f197eee1b procps-3.2.3.ebuild 1012
+MD5 5dbeadf75302e75297ff2fd9605cd50e procps-3.1.12-r1.ebuild 1342
 MD5 416c9134bb5282ee2d9e86b81826f55d procps-3.1.13-r1.ebuild 1185
-MD5 83faec0e015c1a0876a225e8a50a0ae0 procps-3.2.2-r1.ebuild 1069
+MD5 1a12a945ea2a7fdb7103644d22d4cb82 procps-3.1.15.ebuild 1236
 MD5 d9a8450ad971e60a33b45788f89a0718 procps-3.2.0.ebuild 1149
-MD5 868d99b0419594bc75fabf024bbfb770 ChangeLog 11863
-MD5 5dbeadf75302e75297ff2fd9605cd50e procps-3.1.12-r1.ebuild 1342
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515
-MD5 8f0e3a7050a05437d2872c94ea348a87 files/digest-procps-3.1.15 65
+MD5 8eae8fbe8949b39d3853f794f920e348 procps-3.2.1.ebuild 1149
+MD5 96ed990a7e7bce011e8ede6016ed2286 procps-3.2.2-r1.ebuild 1297
+MD5 0491e3f452df27b0196af61a2ab5bf52 procps-3.2.3.ebuild 1241
 MD5 7d8e6a0530e7ebd56a0445da8dcefb9b files/digest-procps-2.0.16-r1 65
+MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12-r1 65
+MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13-r1 65
+MD5 8f0e3a7050a05437d2872c94ea348a87 files/digest-procps-3.1.15 65
 MD5 e442fb89cb9b1f265f5198dfb3859434 files/digest-procps-3.2.0 64
 MD5 c1bbc74ed021ce8b4f496b391f20ab76 files/digest-procps-3.2.1 64
-MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3 64
-MD5 5a46a0ddb09b5c217ae8d97f16da74a7 files/digest-procps-3.2.2-r1 64
-MD5 81ead3c972547f9348f2aebd43af32e4 files/procps-3.2.0-selinux-Z.diff 683
+MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515
 MD5 3dfa108ba0c53240d5bfe044fa8be931 files/procps-3.1.12-selinux.diff.bz2 8800
-MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12-r1 65
-MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13-r1 65
 MD5 01027f00be8fdd5ca08f0d15f1ed1512 files/procps-3.1.15-fix_attr.diff 1270
+MD5 81ead3c972547f9348f2aebd43af32e4 files/procps-3.2.0-selinux-Z.diff 683
+MD5 5a46a0ddb09b5c217ae8d97f16da74a7 files/digest-procps-3.2.2-r1 64
+MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3 64
+MD5 8a56bcff273fcacdcbb28e1284549002 files/procps-mips-define-pagesize.patch 420
diff --git a/sys-apps/procps/files/procps-mips-define-pagesize.patch b/sys-apps/procps/files/procps-mips-define-pagesize.patch
new file mode 100644
index 000000000000..ae3128876e63
--- /dev/null
+++ b/sys-apps/procps/files/procps-mips-define-pagesize.patch
@@ -0,0 +1,12 @@
+diff -Naurp procps-3.2.3.orig/ps/common.h procps-3.2.3/ps/common.h
+--- procps-3.2.3.orig/ps/common.h	2004-04-25 17:03:18.000000000 -0400
++++ procps-3.2.3/ps/common.h	2004-08-12 14:14:15.000000000 -0400
+@@ -16,6 +16,8 @@
+ #include "../proc/readproc.h"
+ #include <asm/page.h>  /* looks safe for glibc, we need PAGE_SIZE */
+ 
++#define PAGE_SIZE sysconf(_SC_PAGESIZE)
++
+ #if 0
+ #define trace(args...) printf(## args)
+ #else
diff --git a/sys-apps/procps/procps-3.2.2-r1.ebuild b/sys-apps/procps/procps-3.2.2-r1.ebuild
index 049e4c5e350c..6caccd386e77 100644
--- a/sys-apps/procps/procps-3.2.2-r1.ebuild
+++ b/sys-apps/procps/procps-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.2-r1.ebuild,v 1.1 2004/07/21 13:59:06 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.2-r1.ebuild,v 1.2 2004/08/13 00:40:42 kumba Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~x86 ~ppc ~sparc mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
@@ -26,6 +26,11 @@ src_unpack() {
 		-e "/^LDFLAGS/s:$: ${LDFLAGS}:" \
 		-e "/install/s: --strip : :" \
 		Makefile
+
+	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
+	# userspace anymore, so this patch instructs procps to get the
+	# value from sysconf().
+	use mips && epatch ${FILESDIR}/${PN}-mips-define-pagesize.patch
 }
 
 src_compile() {
diff --git a/sys-apps/procps/procps-3.2.3.ebuild b/sys-apps/procps/procps-3.2.3.ebuild
index 297b0505894a..3db4911ca918 100644
--- a/sys-apps/procps/procps-3.2.3.ebuild
+++ b/sys-apps/procps/procps-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.3.ebuild,v 1.1 2004/08/10 16:32:12 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.3.ebuild,v 1.2 2004/08/13 00:40:42 kumba Exp $
 
 inherit flag-o-matic eutils
 
@@ -20,6 +20,11 @@ src_unpack() {
 	cd ${S}
 
 	sed -i -e "/install/s: --strip : :" Makefile
+
+	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
+	# userspace anymore, so this patch instructs procps to get the
+	# value from sysconf().
+	use mips && epatch ${FILESDIR}/${PN}-mips-define-pagesize.patch
 }
 
 src_compile() {