components/network/avahi/patches/13-remove-debug-trap.patch

   1 --- /usr/tmp/clean/avahi-0.6.22/avahi-python/Makefile.am        Mon Sep 24 22:11:29 2007
   2 +++ avahi-0.6.22/avahi-python/Makefile.am       Tue Dec 18 08:48:40 2007
   3 @@ -19,9 +19,6 @@
   4
   5  AM_CFLAGS=-I$(top_srcdir)
   6
   7 -# This cool debug trap works on i386/gcc only
   8 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
   9 -
  10  EXTRA_DIST = \
  11         avahi-bookmarks.in
  12
  13 --- /usr/tmp/clean/avahi-0.6.12/avahi-common/Makefile.am        2006-04-24 22:01:32.000000000 +0100
  14 +++ avahi-0.6.12/avahi-common/Makefile.am       2006-08-22 09:35:52.013532000 +0100
  15 @@ -19,9 +19,6 @@
  16
  17  AM_CFLAGS=-I$(top_srcdir)
  18
  19 -# This cool debug trap works on i386/gcc only
  20 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
  21 -
  22  avahi_commonincludedir=$(includedir)/avahi-common
  23
  24  avahi_commoninclude_HEADERS = \
  25 --- /usr/tmp/clean/avahi-0.6.12/avahi-client/Makefile.am        2006-03-01 23:27:45.000000000 +0000
  26 +++ avahi-0.6.12/avahi-client/Makefile.am       2006-08-22 09:37:26.320792000 +0100
  27 @@ -19,9 +19,6 @@
  28
  29  AM_CFLAGS=-I$(top_srcdir)
  30
  31 -# This cool debug trap works on i386/gcc only
  32 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
  33 -
  34  if HAVE_DBUS
  35
  36  avahi_clientincludedir=$(includedir)/avahi-client
  37 --- /usr/tmp/clean/avahi-0.6.12/avahi-compat-libdns_sd/Makefile.am      2005-11-25 01:19:31.000000000 +0000
  38 +++ avahi-0.6.12/avahi-compat-libdns_sd/Makefile.am     2006-08-22 09:38:37.573278000 +0100
  39 @@ -19,9 +19,6 @@
  40
  41  AM_CFLAGS=-I$(top_srcdir)
  42
  43 -# This cool debug trap works on i386/gcc only
  44 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
  45 -
  46  if HAVE_DBUS
  47  if ENABLE_COMPAT_LIBDNS_SD
  48
  49 --- /usr/tmp/clean/avahi-0.6.12/avahi-daemon/Makefile.am        2006-03-01 23:51:22.000000000 +0000
  50 +++ avahi-0.6.12/avahi-daemon/Makefile.am       2006-08-22 09:40:28.041468000 +0100
  51 @@ -19,9 +19,6 @@
  52
  53  AM_CFLAGS=-I$(top_srcdir)
  54
  55 -# This cool debug trap works on i386/gcc only
  56 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
  57 -
  58  if HAVE_LIBDAEMON
  59  if HAVE_XML
  60
  61 --- /usr/tmp/clean/avahi-0.6.12/avahi-glib/Makefile.am  2005-10-19 01:10:29.000000000 +0100
  62 +++ avahi-0.6.12/avahi-glib/Makefile.am 2006-08-22 09:41:03.362768000 +0100
  63 @@ -19,9 +19,6 @@
  64
  65  AM_CFLAGS=-I$(top_srcdir)
  66
  67 -# This cool debug trap works on i386/gcc only
  68 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
  69 -
  70  if HAVE_GLIB
  71
  72  avahiglibincludedir=$(includedir)/avahi-glib
  73 --- /usr/tmp/clean/avahi-0.6.12/avahi-compat-howl/Makefile.am   2005-11-25 01:19:31.000000000 +0000
  74 +++ avahi-0.6.12/avahi-compat-howl/Makefile.am  2006-08-22 09:41:49.972884000 +0100
  75 @@ -19,9 +19,6 @@
  76
  77  AM_CFLAGS=-I$(top_srcdir)
  78
  79 -# This cool debug trap works on i386/gcc only
  80 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
  81 -
  82  SUBDIRS = . samples
  83
  84  if HAVE_DBUS
  85 --- /usr/tmp/clean/avahi-0.6.12/avahi-compat-howl/samples/Makefile.am   2005-11-20 15:02:38.000000000 +0000
  86 +++ avahi-0.6.12/avahi-compat-howl/samples/Makefile.am  2006-08-22 09:42:37.591297000 +0100
  87 @@ -19,9 +19,6 @@
  88
  89  AM_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/avahi-compat-howl/include
  90
  91 -# This cool debug trap works on i386/gcc only
  92 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
  93 -
  94  if HAVE_DBUS
  95  if ENABLE_COMPAT_HOWL
  96
  97 --- /usr/tmp/clean/avahi-0.6.23/avahi-core/Makefile.am  2008-06-23 23:22:38.000000000 +0100
  98 +++ avahi-0.6.23/avahi-core/Makefile.am 2008-06-25 14:06:43.632972000 +0100
  99 @@ -19,9 +19,6 @@
 100
 101  AM_CFLAGS=-I$(top_srcdir)
 102
 103 -# This cool debug trap works on i386/gcc only
 104 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 105 -
 106  avahiincludedir=$(includedir)/avahi-core
 107
 108  avahiinclude_HEADERS = \
 109 @@ -41,14 +38,12 @@
 110         conformance-test \
 111         avahi-reflector \
 112         dns-test \
 113 -       dns-spin-test \
 114         timeeventq-test \
 115         hashmap-test \
 116         querier-test \
 117         update-test
 118
 119  TESTS = \
 120 -       dns-spin-test \
 121         dns-test \
 122         hashmap-test
 123  endif
 124 @@ -147,11 +142,6 @@
 125  dns_test_CFLAGS = $(AM_CFLAGS)
 126  dns_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 127
 128 -dns_spin_test_SOURCES = \
 129 -       dns-spin-test.c
 130 -dns_spin_test_CFLAGS = $(AM_CFLAGS)
 131 -dns_spin_test_LDADD = $(AM_LDADD) libavahi-core.la
 132 -
 133  timeeventq_test_SOURCES = \
 134         timeeventq-test.c \
 135         timeeventq.h timeeventq.c \
 136 +--- /usr/tmp/clean/avahi-0.6.28/avahi-discover-standalone/Makefile.am  2010-08-
 137 26 01:51:39.004153001 +0100
 138 ++++ avahi-0.6.28/avahi-discover-standalone/Makefile.am 2011-01-20 15:30:29.0964
 139 42076 +0000
 140 +@@ -20,9 +20,6 @@
 141 + interfaces = \
 142 +         avahi-discover.ui
 143 +
 144 +-# This cool debug trap works on i386/gcc only
 145 +-AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 146 +-
 147 + if HAVE_GTK2OR3
 148 + if HAVE_GLIB
 149 + bin_PROGRAMS = \
 150 +--- /usr/tmp/clean/avahi-0.6.28/avahi-dnsconfd/Makefile.am     2010-08-26 01:51
 151 :39.005153001 +0100
 152 ++++ avahi-0.6.28/avahi-dnsconfd/Makefile.am    2011-01-20 15:32:22.328800575 +0
 153 000
 154 +@@ -28,9 +28,6 @@
 155 +       -DAVAHI_SOCKET=\"$(avahi_socket)\" \
 156 +       -DAVAHI_DNSCONF_SCRIPT=\"$(pkgsysconfdir)/avahi-dnsconfd.action\"
 157 +
 158 +-# This cool debug trap works on i386/gcc only
 159 +-AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 160 +-
 161 + sbin_PROGRAMS = avahi-dnsconfd
 162 +
 163 + avahi_dnsconfd_SOURCES = main.c
 164 --- avahi-0.6.31/avahi-utils/Makefile.am.~1~    2014-05-19 17:16:33.715046965 +0400
 165 +++ avahi-0.6.31/avahi-utils/Makefile.am        2014-05-19 17:16:44.691932516 +0400
 166 @@ -17,9 +17,6 @@
 167
 168  AM_CFLAGS=-I$(top_srcdir)
 169
 170 -# This cool debug trap works on i386/gcc only
 171 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 172 -
 173  pkglibdatadir=$(libdir)/avahi
 174
 175  if HAVE_DBUS