diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-05 17:54:39 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-05 17:54:39 +0000 |
| commit | 7ff2f9951237b2f669051e503693fc0dcd9fc4e0 (patch) | |
| tree | 3f00889c4514d57fbd40385d6d76db6b9f867852 /sys-process/psmisc/files | |
| parent | add ~arm, bug #331061 (diff) | |
| download | gentoo-2-7ff2f9951237b2f669051e503693fc0dcd9fc4e0.tar.gz gentoo-2-7ff2f9951237b2f669051e503693fc0dcd9fc4e0.tar.bz2 gentoo-2-7ff2f9951237b2f669051e503693fc0dcd9fc4e0.zip | |
Transfer prefix and clean up
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-process/psmisc/files')
| -rw-r--r-- | sys-process/psmisc/files/psmisc-22.12-no-nls.patch | 32 | ||||
| -rw-r--r-- | sys-process/psmisc/files/psmisc-22.12-peekfd.patch | 38 |
2 files changed, 2 insertions, 68 deletions
diff --git a/sys-process/psmisc/files/psmisc-22.12-no-nls.patch b/sys-process/psmisc/files/psmisc-22.12-no-nls.patch deleted file mode 100644 index d18b36af3f6c..000000000000 --- a/sys-process/psmisc/files/psmisc-22.12-no-nls.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 index 81b508b27298..bb0686152321 100644 --- a/sys-process/psmisc/files/psmisc-22.12-peekfd.patch +++ b/sys-process/psmisc/files/psmisc-22.12-peekfd.patch @@ -1,21 +1,8 @@ -Fix building of peekfd for X86_64 +Fix building of peekfd for x86_64 (from upstream). --- 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, +@@ -66,7 +66,8 @@ struct user_regs_struct.rdi, struct user_regs_struct.rsi, struct user_regs_struct.rdx], [],[], @@ -25,24 +12,3 @@ Fix building of peekfd for X86_64 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 |