patches/strace/4.5.15/180-undef-PACKET_MEMBERSHIP.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 29 21:16:51 2009 +0100 (2009-12-29)
changeset 1667 a5020a1facff
parent 746 b150d6f590fc
permissions -rw-r--r--
config: fix generated config files when GREP_OPTIONS set --color=always

grep is used when generating some .in files (in config.gen). If GREP_OPTIONS
contains --color=always, then the generated files will contains some escape
sequences setting the color, and mconf would choke on those escape sequences.

Always set and export an empty GREP_OPTIONS to avoid that.

Issue reported by Kevin Kirkup <kevin dot kirkup at gmail dot com> :
http://sourceware.org/ml/crossgcc/2009-12/msg00026.html
     1 diff -dur strace-4.5.15.orig/net.c strace-4.5.15/net.c
     2 --- strace-4.5.15.orig/net.c	2006-12-13 20:57:23.000000000 +0100
     3 +++ strace-4.5.15/net.c	2007-07-14 19:29:36.000000000 +0200
     4 @@ -800,8 +800,12 @@
     5  
     6  #ifdef SOL_PACKET
     7  static const struct xlat sockpacketoptions[] = {
     8 +#if defined(PACKET_ADD_MEMBERSHIP)
     9  	{ PACKET_ADD_MEMBERSHIP,	"PACKET_ADD_MEMBERSHIP"	},
    10 +#endif
    11 +#if defined(PACKET_DROP_MEMBERSHIP)
    12  	{ PACKET_DROP_MEMBERSHIP,	"PACKET_DROP_MEMBERSHIP"},
    13 +#endif
    14  #if defined(PACKET_RECV_OUTPUT)
    15  	{ PACKET_RECV_OUTPUT,		"PACKET_RECV_OUTPUT"	},
    16  #endif