Fix building of "peekfd" for X86_64.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 88 insertions, 3 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 9e67063b7298..1f584c3c21e1 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.102 2010/07/30 23:01:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.103 2010/07/31 00:27:32 ssuominen Exp $
+
+  31 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> psmisc-22.12.ebuild,
+  +files/psmisc-22.12-no-nls.patch, +files/psmisc-22.12-peekfd.patch:
+  Fix building of "peekfd" for X86_64.
 
 *psmisc-22.12 (30 Jul 2010)
 
diff --git a/sys-process/psmisc/files/psmisc-22.12-no-nls.patch b/sys-process/psmisc/files/psmisc-22.12-no-nls.patch
new file mode 100644
index 000000000000..d18b36af3f6c
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.12-no-nls.patch
@@ -0,0 +1,32 @@
+http://bugs.gentoo.org/193920
+
+--- configure.ac
++++ configure.ac
+@@ -57,10 +57,6 @@
+ AC_CHECK_MEMBERS([struct stat.st_rdev])
+ AC_TYPE_UID_T
+ 
+-dnl Check for language stuff
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.16.1])
+-
+ dnl Must be after the gettext stuff as it sets build_cpu
+ AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
+ 		struct user_regs_struct.eax,
+@@ -120,6 +116,5 @@
+ AC_CONFIG_FILES([Makefile
+ 		 doc/Makefile
+ 		 src/Makefile
+-		 icons/Makefile
+-		 po/Makefile.in])
++		 icons/Makefile])
+ AC_OUTPUT
+--- Makefile.am
++++ Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS = doc src po icons 
++SUBDIRS = doc src icons 
+ 
+ #EXTRA_DIST = config.rpath ABOUT-NLS mkinstalldirs
+ 
diff --git a/sys-process/psmisc/files/psmisc-22.12-peekfd.patch b/sys-process/psmisc/files/psmisc-22.12-peekfd.patch
new file mode 100644
index 000000000000..81b508b27298
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.12-peekfd.patch
@@ -0,0 +1,48 @@
+Fix building of peekfd for X86_64
+
+--- configure.ac
++++ configure.ac
+@@ -56,6 +56,12 @@ AC_TYPE_PID_T
+ AC_TYPE_SIZE_T
+ AC_CHECK_MEMBERS([struct stat.st_rdev])
+ AC_TYPE_UID_T
++
++dnl Check for language stuff
++AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.16.1])
++
++dnl Must be after the gettext stuff as it sets build_cpu
+ AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
+ 		struct user_regs_struct.eax,
+ 		struct user_regs_struct.ebx,
+@@ -66,11 +72,13 @@ AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
+ 		struct user_regs_struct.rdi,
+ 		struct user_regs_struct.rsi,
+ 		struct user_regs_struct.rdx], [],[],
+-    [#include <sys/user.h>])
++    [#include <bits/types.h>
++     #include <sys/user.h>])
+ AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3,
+ 		struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>])
+ AC_CHECK_MEMBERS([struct pt_regs.uregs],[],[], [#include <asm/ptrace.h>])
+-AC_CHECK_MEMBERS([struct pt_regs.regs],[],[], [#include <asm/ptrace.h>])
++AC_CHECK_MEMBERS([struct pt_regs.regs,
++                  struct pt_regs.cp0_status],[],[], [#include <asm/ptrace.h>])
+ 
+ AM_CONDITIONAL(WANT_PEEKFD_I386,
+  test $ac_cv_member_struct_user_regs_struct_orig_eax = yes &&
+@@ -90,11 +98,9 @@ AM_CONDITIONAL(WANT_PEEKFD_PPC,
+ AM_CONDITIONAL(WANT_PEEKFD_ARM,
+    test $ac_cv_member_struct_pt_regs_uregs = yes)
+ AM_CONDITIONAL(WANT_PEEKFD_MIPS,
+-   test $ac_cv_member_struct_pt_regs_regs = yes)
+-
+-dnl Check for language stuff
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.16.1])
++   test $build_cpu = mipsel &&
++   test $ac_cv_member_struct_pt_regs_regs = yes &&
++   test $ac_cv_member_struct_pt_regs_cp0_status = yes)
+ 
+ dnl Checks for library functions.
+ AC_FUNC_CLOSEDIR_VOID
diff --git a/sys-process/psmisc/psmisc-22.12.ebuild b/sys-process/psmisc/psmisc-22.12.ebuild
index 9a7bf207b574..1cfd59085228 100644
--- a/sys-process/psmisc/psmisc-22.12.ebuild
+++ b/sys-process/psmisc/psmisc-22.12.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/psmisc/psmisc-22.12.ebuild,v 1.1 2010/07/30 23:01:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.12.ebuild,v 1.2 2010/07/31 00:27:32 ssuominen Exp $
 
 inherit autotools eutils
 
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	use nls || epatch "${FILESDIR}"/${PN}-22.5-no-nls.patch #193920
+	epatch "${FILESDIR}"/${P}-peekfd.patch
+	use nls || epatch "${FILESDIR}"/${PN}-22.12-no-nls.patch #193920
 	eautoreconf
 }