1 |
ssuominen 10/07/31 00:27:33 |
2 |
|
3 |
Added: psmisc-22.12-no-nls.patch psmisc-22.12-peekfd.patch |
4 |
Log: |
5 |
Fix building of "peekfd" for X86_64. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sys-process/psmisc/files/psmisc-22.12-no-nls.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/psmisc/files/psmisc-22.12-no-nls.patch?rev=1.1&view=markup |
12 |
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 |
13 |
|
14 |
Index: psmisc-22.12-no-nls.patch |
15 |
=================================================================== |
16 |
http://bugs.gentoo.org/193920 |
17 |
|
18 |
--- configure.ac |
19 |
+++ configure.ac |
20 |
@@ -57,10 +57,6 @@ |
21 |
AC_CHECK_MEMBERS([struct stat.st_rdev]) |
22 |
AC_TYPE_UID_T |
23 |
|
24 |
-dnl Check for language stuff |
25 |
-AM_GNU_GETTEXT([external]) |
26 |
-AM_GNU_GETTEXT_VERSION([0.16.1]) |
27 |
- |
28 |
dnl Must be after the gettext stuff as it sets build_cpu |
29 |
AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax, |
30 |
struct user_regs_struct.eax, |
31 |
@@ -120,6 +116,5 @@ |
32 |
AC_CONFIG_FILES([Makefile |
33 |
doc/Makefile |
34 |
src/Makefile |
35 |
- icons/Makefile |
36 |
- po/Makefile.in]) |
37 |
+ icons/Makefile]) |
38 |
AC_OUTPUT |
39 |
--- Makefile.am |
40 |
+++ Makefile.am |
41 |
@@ -1,5 +1,5 @@ |
42 |
|
43 |
-SUBDIRS = doc src po icons |
44 |
+SUBDIRS = doc src icons |
45 |
|
46 |
#EXTRA_DIST = config.rpath ABOUT-NLS mkinstalldirs |
47 |
|
48 |
|
49 |
|
50 |
|
51 |
1.1 sys-process/psmisc/files/psmisc-22.12-peekfd.patch |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/psmisc/files/psmisc-22.12-peekfd.patch?rev=1.1&view=markup |
54 |
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 |
55 |
|
56 |
Index: psmisc-22.12-peekfd.patch |
57 |
=================================================================== |
58 |
Fix building of peekfd for X86_64 |
59 |
|
60 |
--- configure.ac |
61 |
+++ configure.ac |
62 |
@@ -56,6 +56,12 @@ AC_TYPE_PID_T |
63 |
AC_TYPE_SIZE_T |
64 |
AC_CHECK_MEMBERS([struct stat.st_rdev]) |
65 |
AC_TYPE_UID_T |
66 |
+ |
67 |
+dnl Check for language stuff |
68 |
+AM_GNU_GETTEXT([external]) |
69 |
+AM_GNU_GETTEXT_VERSION([0.16.1]) |
70 |
+ |
71 |
+dnl Must be after the gettext stuff as it sets build_cpu |
72 |
AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax, |
73 |
struct user_regs_struct.eax, |
74 |
struct user_regs_struct.ebx, |
75 |
@@ -66,11 +72,13 @@ AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax, |
76 |
struct user_regs_struct.rdi, |
77 |
struct user_regs_struct.rsi, |
78 |
struct user_regs_struct.rdx], [],[], |
79 |
- [#include <sys/user.h>]) |
80 |
+ [#include <bits/types.h> |
81 |
+ #include <sys/user.h>]) |
82 |
AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, |
83 |
struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>]) |
84 |
AC_CHECK_MEMBERS([struct pt_regs.uregs],[],[], [#include <asm/ptrace.h>]) |
85 |
-AC_CHECK_MEMBERS([struct pt_regs.regs],[],[], [#include <asm/ptrace.h>]) |
86 |
+AC_CHECK_MEMBERS([struct pt_regs.regs, |
87 |
+ struct pt_regs.cp0_status],[],[], [#include <asm/ptrace.h>]) |
88 |
|
89 |
AM_CONDITIONAL(WANT_PEEKFD_I386, |
90 |
test $ac_cv_member_struct_user_regs_struct_orig_eax = yes && |
91 |
@@ -90,11 +98,9 @@ AM_CONDITIONAL(WANT_PEEKFD_PPC, |
92 |
AM_CONDITIONAL(WANT_PEEKFD_ARM, |
93 |
test $ac_cv_member_struct_pt_regs_uregs = yes) |
94 |
AM_CONDITIONAL(WANT_PEEKFD_MIPS, |
95 |
- test $ac_cv_member_struct_pt_regs_regs = yes) |
96 |
- |
97 |
-dnl Check for language stuff |
98 |
-AM_GNU_GETTEXT([external]) |
99 |
-AM_GNU_GETTEXT_VERSION([0.16.1]) |
100 |
+ test $build_cpu = mipsel && |
101 |
+ test $ac_cv_member_struct_pt_regs_regs = yes && |
102 |
+ test $ac_cv_member_struct_pt_regs_cp0_status = yes) |
103 |
|
104 |
dnl Checks for library functions. |
105 |
AC_FUNC_CLOSEDIR_VOID |