On Fri, 2006-09-15 at 22:55 -0400, X Strike Force SVN Repository Admin wrote: > Author: dparsons > Date: 2006-09-15 22:55:21 -0400 (Fri, 15 Sep 2006) > New Revision: 3218 > > Added: > > branches/7.1/xserver/xorg-server/debian/patches/18_execinfo_configured.patch > > branches/7.1/xserver/xorg-server/debian/patches/18_execinfo_only_for_backtrace.patch > Modified: > branches/7.1/xserver/xorg-server/debian/changelog > branches/7.1/xserver/xorg-server/debian/patches/series > Log: > * Apply upstream patches 18_execinfo_configured.patch, > 18_execinfo_only_for_backtrace.patch, to use execinfo.h for and > only for backtrace. Closes: #363218.
[...] > +--- a/configure.ac > ++++ b/configure.ac > +@@ -174,6 +174,7 @@ dnl glibc backtrace support check (hw/xf > + AC_CHECK_HEADER([execinfo.h],[ > + AC_CHECK_LIB(c, backtrace, [ > + AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support]) > ++ AC_DEFINE(HAVE_EXECINFO_H, 1, [Have execinfo.h]) This is redundant, as... > Added: > branches/7.1/xserver/xorg-server/debian/patches/18_execinfo_only_for_backtrace.patch > =================================================================== > --- > branches/7.1/xserver/xorg-server/debian/patches/18_execinfo_only_for_backtrace.patch > (rev 0) > +++ > branches/7.1/xserver/xorg-server/debian/patches/18_execinfo_only_for_backtrace.patch > 2006-09-16 02:55:21 UTC (rev 3218) > @@ -0,0 +1,31 @@ > +From: Michel Dänzer <[EMAIL PROTECTED]> > +Date: Sat, 24 Jun 2006 13:09:24 +0000 (+0200) > +Subject: Make sure <execinfo.h> is actually included when needed. > +X-Git-Tag: xorg-server-1.1.99.3 > +X-Git-Url: > http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=36756fdb2ddc154b406f664a6af0f38d26e6973d > + > +Make sure <execinfo.h> is actually included when needed. > + > +configure only defines HAVE_BACKTRACE, not HAVE_EXECINFO_H. > + > +This could cause problems on platforms where the size of a pointer is greater > +than that of an integer, see > +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=363218 . > +--- > + > +--- a/hw/xfree86/common/xf86Events.c > ++++ b/hw/xfree86/common/xf86Events.c > +@@ -1255,12 +1255,8 @@ xf86InterceptSigIll(void (*sigillhandler > + xf86SigIllHandler = sigillhandler; > + } > + > +-#ifdef HAVE_EXECINFO_H > +-#define HAVE_BACKTRACE > +-#include <execinfo.h> > +-#endif > +- > + #ifdef HAVE_BACKTRACE > ++#include <execinfo.h> ...this only checks for HAVE_BACKTRACE. -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer
