Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.5.17/150-undef-CTL_PROC.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch1.12
changeset 2655 3ba359965eb0
parent 747 d3e603e7c17c
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)
yann@974 
     1
 
Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/150-undef-CTL_PROC.patch
yann@974 
     2
 
-= BEGIN original header =-
yann@428 
     3
 
diff -dur strace-4.5.16.orig/system.c strace-4.5.16/system.c
yann@974 
     4
 
-= END original header =-
yann@974 
     5
 
diff -durN strace-4.5.17.orig/system.c strace-4.5.17/system.c
yann@974 
     6
 
--- strace-4.5.17.orig/system.c	2007-01-17 00:22:36.000000000 +0100
yann@974 
     7
 
+++ strace-4.5.17/system.c	2008-10-24 21:30:13.000000000 +0200
yann@428 
     8
 
@@ -1612,7 +1612,9 @@
yann@428 
     9
 
 	{ CTL_KERN, "CTL_KERN" },
yann@428 
    10
 
 	{ CTL_VM, "CTL_VM" },
yann@428 
    11
 
 	{ CTL_NET, "CTL_NET" },
yann@428 
    12
 
+#ifdef CTL_PROC
yann@428 
    13
 
 	{ CTL_PROC, "CTL_PROC" },
yann@428 
    14
 
+#endif
yann@428 
    15
 
 	{ CTL_FS, "CTL_FS" },
yann@428 
    16
 
 	{ CTL_DEBUG, "CTL_DEBUG" },
yann@428 
    17
 
 	{ CTL_DEV, "CTL_DEV" },
crosstool-ng