diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-30 15:36:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-30 15:36:33 +0000 |
| commit | 84983f974f125ead0971923a61bfd00dfc505365 (patch) | |
| tree | 328efbc30b731f40a1f76ed29ee9ff51acb2c590 /pkgs/development/tools/misc/strace | |
| parent | 39b95dd1f9878513ecac909e72b7cc48fa13c9c6 (diff) | |
| download | nixlib-84983f974f125ead0971923a61bfd00dfc505365.tar nixlib-84983f974f125ead0971923a61bfd00dfc505365.tar.gz nixlib-84983f974f125ead0971923a61bfd00dfc505365.tar.bz2 nixlib-84983f974f125ead0971923a61bfd00dfc505365.tar.lz nixlib-84983f974f125ead0971923a61bfd00dfc505365.tar.xz nixlib-84983f974f125ead0971923a61bfd00dfc505365.tar.zst nixlib-84983f974f125ead0971923a61bfd00dfc505365.zip | |
* Strace fixes.
svn path=/nixpkgs/trunk/; revision=6911
Diffstat (limited to 'pkgs/development/tools/misc/strace')
| -rw-r--r-- | pkgs/development/tools/misc/strace/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/strace/fixes.patch | 33 |
2 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 4be263a05555..dad179627a4a 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -8,4 +8,6 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/strace-4.5.14.tar.bz2; md5 = "09bcd5d00ece28f8154dec11cadfce3c"; }; + + patches = [./fixes.patch]; } diff --git a/pkgs/development/tools/misc/strace/fixes.patch b/pkgs/development/tools/misc/strace/fixes.patch new file mode 100644 index 000000000000..9213d3c0a100 --- /dev/null +++ b/pkgs/development/tools/misc/strace/fixes.patch @@ -0,0 +1,33 @@ +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 ---- |