mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
* Latest strace.
svn path=/nixpkgs/trunk/; revision=8512
This commit is contained in:
parent
8ede3fba35
commit
ad6fa03dfd
@ -1,5 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
export CFLAGS="$CFLAGS -D_LINUX_QUOTA_VERSION=1"
|
||||
|
||||
genericBuild
|
@ -1,13 +1,10 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "strace-4.5.14";
|
||||
name = "strace-4.5.15";
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/strace-4.5.14.tar.bz2;
|
||||
md5 = "09bcd5d00ece28f8154dec11cadfce3c";
|
||||
url = http://heanet.dl.sourceforge.net/sourceforge/strace/strace-4.5.15.tar.gz;
|
||||
sha256 = "07n62yv53p2hsb59srfaxb0kk8b6p6iq77drmf65pq8jpa50s9ip";
|
||||
};
|
||||
|
||||
patches = [./fixes.patch];
|
||||
}
|
||||
|
@ -1,33 +0,0 @@
|
||||
diff -rc strace-4.5.14-orig/strace.c strace-4.5.14/strace.c
|
||||
*** strace-4.5.14-orig/strace.c 2006-10-30 16:27:17.000000000 +0100
|
||||
--- strace-4.5.14/strace.c 2006-10-30 16:27:27.000000000 +0100
|
||||
***************
|
||||
*** 2251,2257 ****
|
||||
if (!cflag
|
||||
&& (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
|
||||
unsigned long addr = 0, pc = 0;
|
||||
! #ifdef PT_GETSIGINFO
|
||||
# define PSR_RI 41
|
||||
struct siginfo si;
|
||||
unsigned long psr;
|
||||
--- 2251,2257 ----
|
||||
if (!cflag
|
||||
&& (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
|
||||
unsigned long addr = 0, pc = 0;
|
||||
! #ifdef PT_CR_IPSR
|
||||
# define PSR_RI 41
|
||||
struct siginfo si;
|
||||
unsigned long psr;
|
||||
diff -rc strace-4.5.14-orig/system.c strace-4.5.14/system.c
|
||||
*** strace-4.5.14-orig/system.c 2006-01-12 22:21:06.000000000 +0100
|
||||
--- strace-4.5.14/system.c 2006-10-30 16:31:46.000000000 +0100
|
||||
***************
|
||||
*** 1578,1584 ****
|
||||
{ CTL_KERN, "CTL_KERN" },
|
||||
{ CTL_VM, "CTL_VM" },
|
||||
{ CTL_NET, "CTL_NET" },
|
||||
- { CTL_PROC, "CTL_PROC" },
|
||||
{ CTL_FS, "CTL_FS" },
|
||||
{ CTL_DEBUG, "CTL_DEBUG" },
|
||||
{ CTL_DEV, "CTL_DEV" },
|
||||
--- 1578,1583 ----
|
Loading…
Reference in New Issue
Block a user