utils/psmisc: fix peekfd issue on mips/big-endian targets, included upstream patch...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22276 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/utils/psmisc/Makefile b/utils/psmisc/Makefile
index 02ac706..6adf49f 100644 (file)
--- a/utils/psmisc/Makefile
+++ b/utils/psmisc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=psmisc
 PKG_VERSION:=22.12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/psmisc

diff --git a/utils/psmisc/patches/001-peekfd_fix.patch b/utils/psmisc/patches/001-peekfd_fix.patch
new file mode 100644 (file)
index 0000000..01cedf1
--- /dev/null
+++ b/utils/psmisc/patches/001-peekfd_fix.patch
@@ -0,0 +1,55 @@
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.61)
+-AC_INIT([psmisc],[22.12])
++AC_INIT([psmisc],[22.12])
+ AC_CONFIG_SRCDIR([src/comm.h])
+ AC_CONFIG_HEADER([config.h])
+ AC_CONFIG_AUX_DIR([config])
+@@ -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