Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Sun Jan 05 19:25:54 2014 +0100 (2014-01-05)
changeset 3274 baa61856643b
permissions -rw-r--r--
libc/glibc: print name of skipped addon

When trying to extract an already present (aka bundled) addon,
print the name of that addon, for clarity, and to help analyse
the build.log post-mortem.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>

     2 Date: 2013-08-26

     3 Initial Package Version: 4.8

     4 Upstream Status: Unknown

     5 Origin: Unknown

     6 Description: Fixes compilation with glibc-2.18.

     7 From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net.

     8 http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm

     9 Their changelog reports:

    10  * Wed Aug 14 2013 schwab@suse.de

    11  - strace-linux-ptrace-h.patch: handle conflict with struct

    12    ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>

    13 

    14 

    15 Index: strace-4.8/process.c

    16 ===================================================================

    17 --- strace-4.8.orig/process.c

    18 +++ strace-4.8/process.c

    19 @@ -63,9 +63,11 @@

    20  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS

    21  #  define pt_all_user_regs XXX_pt_all_user_regs

    22  # endif

    23 +# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args

    24  # include <linux/ptrace.h>

    25  # undef ia64_fpreg

    26  # undef pt_all_user_regs

    27 +# undef ptrace_peeksiginfo_args

    28  #endif

    29  

    30  #if defined(SPARC64)

    31 Index: strace-4.8/signal.c

    32 ===================================================================

    33 --- strace-4.8.orig/signal.c

    34 +++ strace-4.8/signal.c

    35 @@ -51,9 +51,11 @@

    36  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS

    37  #  define pt_all_user_regs XXX_pt_all_user_regs

    38  # endif

    39 +# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args

    40  # include <linux/ptrace.h>

    41  # undef ia64_fpreg

    42  # undef pt_all_user_regs

    43 +# undef ptrace_peeksiginfo_args

    44  #endif

    45  

    46  #ifdef IA64

    47 Index: strace-4.8/syscall.c

    48 ===================================================================

    49 --- strace-4.8.orig/syscall.c

    50 +++ strace-4.8/syscall.c

    51 @@ -48,9 +48,11 @@

    52  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS

    53  #  define pt_all_user_regs XXX_pt_all_user_regs

    54  # endif

    55 +# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args

    56  # include <linux/ptrace.h>

    57  # undef ia64_fpreg

    58  # undef pt_all_user_regs

    59 +# undef ptrace_peeksiginfo_args

    60  #endif

    61  

    62  #if defined(SPARC64)

    63 Index: strace-4.8/util.c

    64 ===================================================================

    65 --- strace-4.8.orig/util.c

    66 +++ strace-4.8/util.c

    67 @@ -55,9 +55,11 @@

    68  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS

    69  #  define pt_all_user_regs XXX_pt_all_user_regs

    70  # endif

    71 +# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args

    72  # include <linux/ptrace.h>

    73  # undef ia64_fpreg

    74  # undef pt_all_user_regs

    75 +# undef ptrace_peeksiginfo_args

    76  #endif

    77  

    78  int
crosstool-ng