Author: adconrad Date: 2014-01-10 17:27:57 +0000 (Fri, 10 Jan 2014) New Revision: 5904
Added: glibc-package/branches/eglibc-2.18/debian/patches/any/cvs-ptrace_peeksiginfo_args.diff Modified: glibc-package/branches/eglibc-2.18/debian/changelog Log: debian/patches/any/cvs-ptrace_peeksiginfo_args.diff: Prepend __ prefix to ptrace_peeksiginfo_args struct to prevent namespace clash w/ linux. Modified: glibc-package/branches/eglibc-2.18/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-03 14:02:39 UTC (rev 5903) +++ glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-10 17:27:57 UTC (rev 5904) @@ -8,6 +8,8 @@ * debian/testsuite-checking/*: Normalize expected results for ARM ports. * debian/patches/i386/cvs-sse42-strstr*: Backport upstream commits which drop buggy SSE4.2 srtstr implementations in favour of an SSE2 version. + * debian/patches/any/cvs-ptrace_peeksiginfo_args.diff: Prepend __ prefix + to ptrace_peeksiginfo_args struct to prevent namespace clash w/ linux. [ Aurelien Jarno ] * debian/patches/any/cvs-vfscanf-0e+0.diff: new patch from upstream to Added: glibc-package/branches/eglibc-2.18/debian/patches/any/cvs-ptrace_peeksiginfo_args.diff =================================================================== --- glibc-package/branches/eglibc-2.18/debian/patches/any/cvs-ptrace_peeksiginfo_args.diff (rev 0) +++ glibc-package/branches/eglibc-2.18/debian/patches/any/cvs-ptrace_peeksiginfo_args.diff 2014-01-10 17:27:57 UTC (rev 5904) @@ -0,0 +1,146 @@ +commit 9341dde4d56ca71b61b47c8b87a06e6d5813ed0e +Author: Mike Frysinger <vap...@gentoo.org> +Date: Sun Jan 5 16:07:13 2014 -0500 + + ptrace.h: add __ prefix to ptrace_peeksiginfo_args + + All the other ptrace structures in this file have a __ prefix except this + new one. This in turn causes build problems for most packages that try to + use ptrace such as strace: + + gcc -DHAVE_CONFIG_H -I. -I../.. -I../../linux/x86_64 -I../../linux \ + -I./linux -Wall -Wwrite-strings -g -O2 -MT process.o -MD -MP \ + -MF .deps/process.Tpo -c -o process.o ../../process.c + In file included from ../../process.c:63:0: + /usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args' + struct ptrace_peeksiginfo_args { + ^ + In file included from ../../defs.h:159:0, + from ../../process.c:37: + /usr/include/sys/ptrace.h:191:8: note: originally defined here + struct ptrace_peeksiginfo_args + ^ + + Since this struct was introduced in glibc-2.18, there shouldn't be any + real regressions with adding the __ prefix. + + Signed-off-by: Mike Frysinger <vap...@gentoo.org> + +2014-01-06 Mike Frysinger <vap...@gentoo.org> + + * sysdeps/unix/sysv/linux/sys/ptrace.h (ptrace_peeksiginfo_args): + Rename to ... + (__ptrace_peeksiginfo_args): ... this. + * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise. + * sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise. + +2014-01-06 Mike Frysinger <vap...@gentoo.org> + + * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h (ptrace_peeksiginfo_args): + Rename to ... + (__ptrace_peeksiginfo_args): ... this. + +2014-01-06 Mike Frysinger <vap...@gentoo.org> + + * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (ptrace_peeksiginfo_args): + Rename to ... + (__ptrace_peeksiginfo_args): ... this. + +2014-01-06 Mike Frysinger <vap...@gentoo.org> + + * sysdeps/unix/sysv/linux/tile/sys/ptrace.h (ptrace_peeksiginfo_args): + Rename to ... + (__ptrace_peeksiginfo_args): ... this. + +diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h +index c8aff0e..ca57bb5 100644 +--- a/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h ++++ b/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h +@@ -165,7 +165,7 @@ enum __ptrace_eventcodes + }; + + /* Arguments for PTRACE_PEEKSIGINFO. */ +-struct ptrace_peeksiginfo_args ++struct __ptrace_peeksiginfo_args + { + __uint64_t off; /* From which siginfo to start. */ + __uint32_t flags; /* Flags for peeksiginfo. */ +diff --git a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h +index 0ea6d40..801a549 100644 +--- a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h ++++ b/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h +@@ -185,7 +185,7 @@ enum __ptrace_eventcodes + }; + + /* Arguments for PTRACE_PEEKSIGINFO. */ +-struct ptrace_peeksiginfo_args ++struct __ptrace_peeksiginfo_args + { + __uint64_t off; /* From which siginfo to start. */ + __uint32_t flags; /* Flags for peeksiginfo. */ +diff --git a/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h +index 2a52469..be31308 100644 +--- a/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h ++++ b/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h +@@ -154,7 +154,7 @@ enum __ptrace_eventcodes + }; + + /* Arguments for PTRACE_PEEKSIGINFO. */ +-struct ptrace_peeksiginfo_args ++struct __ptrace_peeksiginfo_args + { + __uint64_t off; /* From which siginfo to start. */ + __uint32_t flags; /* Flags for peeksiginfo. */ +diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h +index d798b5a..dd81efc 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h ++++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h +@@ -158,7 +158,7 @@ enum __ptrace_eventcodes + }; + + /* Arguments for PTRACE_PEEKSIGINFO. */ +-struct ptrace_peeksiginfo_args ++struct __ptrace_peeksiginfo_args + { + __uint64_t off; /* From which siginfo to start. */ + __uint32_t flags; /* Flags for peeksiginfo. */ +diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h +index d86188e..741dce6 100644 +--- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h ++++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h +@@ -197,7 +197,7 @@ enum __ptrace_eventcodes + }; + + /* Arguments for PTRACE_PEEKSIGINFO. */ +-struct ptrace_peeksiginfo_args ++struct __ptrace_peeksiginfo_args + { + __uint64_t off; /* From which siginfo to start. */ + __uint32_t flags; /* Flags for peeksiginfo. */ +diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h +index 2395c31..0f6c2cc 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h ++++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h +@@ -240,7 +240,7 @@ enum __ptrace_eventcodes + }; + + /* Arguments for PTRACE_PEEKSIGINFO. */ +-struct ptrace_peeksiginfo_args ++struct __ptrace_peeksiginfo_args + { + __uint64_t off; /* From which siginfo to start. */ + __uint32_t flags; /* Flags for peeksiginfo. */ +diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h +index ddcefba..e800562 100644 +--- a/sysdeps/unix/sysv/linux/sys/ptrace.h ++++ b/sysdeps/unix/sysv/linux/sys/ptrace.h +@@ -188,7 +188,7 @@ enum __ptrace_eventcodes + }; + + /* Arguments for PTRACE_PEEKSIGINFO. */ +-struct ptrace_peeksiginfo_args ++struct __ptrace_peeksiginfo_args + { + __uint64_t off; /* From which siginfo to start. */ + __uint32_t flags; /* Flags for peeksiginfo. */ -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1w1fsd-00082k...@moszumanska.debian.org