From 8ec951004149391c4d99f13c486e889b54310d84 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 21 Nov 2010 20:16:28 +0000
Subject: Fix some build warnings and apply fix by Chris Coleman for HZ warning
 #303120 by Alexander Holler.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
---
 .../procps/files/procps-3.2.8-forest-prefix.patch  | 38 ++++++++++++++++++++++
 .../procps/files/procps-3.2.8-linux-ver-init.patch | 23 +++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 sys-process/procps/files/procps-3.2.8-forest-prefix.patch
 create mode 100644 sys-process/procps/files/procps-3.2.8-linux-ver-init.patch

(limited to 'sys-process/procps/files')

diff --git a/sys-process/procps/files/procps-3.2.8-forest-prefix.patch b/sys-process/procps/files/procps-3.2.8-forest-prefix.patch
new file mode 100644
index 000000000000..915be67308b7
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8-forest-prefix.patch
@@ -0,0 +1,38 @@
+avoid gcc warnings like:
+
+ps/output.c:341:6: warning: the address of ‘forest_prefix’ will always evaluate as ‘true’
+
+Index: ps/output.c
+===================================================================
+RCS file: /cvsroot/procps/procps/ps/output.c,v
+retrieving revision 1.63
+diff -u -p -r1.63 output.c
+--- ps/output.c	3 May 2009 06:39:33 -0000	1.63
++++ ps/output.c	14 Nov 2010 00:24:56 -0000
+@@ -338,7 +338,7 @@ static int pr_args(char *restrict const 
+   unsigned flags;
+   int rightward=max_rightward;
+ 
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
+@@ -365,7 +365,7 @@ static int pr_comm(char *restrict const 
+   unsigned flags;
+   int rightward=max_rightward;
+   
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
+@@ -390,7 +390,7 @@ static int pr_fname(char *restrict const
+   char *endp = outbuf;
+   int rightward = max_rightward;
+   
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
diff --git a/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch b/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch
new file mode 100644
index 000000000000..6d4039c91088
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/303120
+
+make sure the linux version constructor runs before the libproc constructor
+since the latter uses variables setup by the former
+
+fix by Chris Coleman
+
+Index: proc/version.c
+===================================================================
+RCS file: /cvsroot/procps/procps/proc/version.c,v
+retrieving revision 1.7
+diff -u -p -r1.7 version.c
+--- proc/version.c	9 Feb 2003 07:27:16 -0000	1.7
++++ proc/version.c	14 Nov 2010 00:22:44 -0000
+@@ -33,7 +33,7 @@ void display_version(void) {
+ 
+ int linux_version_code;
+ 
+-static void init_Linux_version(void) __attribute__((constructor));
++static void init_Linux_version(void) __attribute__((constructor(100)));
+ static void init_Linux_version(void) {
+     static struct utsname uts;
+     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
-- 
cgit v1.2.3-65-gdbad