[gentoo-commits] gentoo-x86 commit in sys-process/psmisc/files: psmisc-22.12-no-nls.patch psmisc-22.12-peekfd.patch

[gentoo-commits] gentoo-x86 commit in sys-process/psmisc/files: psmisc-22.12-no-nls.patch psmisc-22.12-peekfd.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/07/31 00:27:33

  Added:                psmisc-22.12-no-nls.patch psmisc-22.12-peekfd.patch
  Log:
  Fix building of "peekfd" for X86_64.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-process/psmisc/files/psmisc-22.12-no-nls.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/psmisc/files/psmisc-22.12-no-nls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/psmisc/files/psmisc-22.12-no-nls.patch?rev=1.1&content-type=text/plain

Index: psmisc-22.12-no-nls.patch
===================================================================
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
 



1.1                  sys-process/psmisc/files/psmisc-22.12-peekfd.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/psmisc/files/psmisc-22.12-peekfd.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/psmisc/files/psmisc-22.12-peekfd.patch?rev=1.1&content-type=text/plain

Index: psmisc-22.12-peekfd.patch
===================================================================
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