User: ubuntu-de...@lists.ubuntu.com
Usertags: precise ubuntu-patch
Tags: patch
Hello! I wrote the attached patch to fix this issue in Ubuntu.
The problem is that the function to print a backtrace when sphinxsearch
hits a problem only defined a certain macro for i386 and amd64. So I
just guarded that 'print a backtrace' block with an #ifdef.
Thanks for considering the patch.
-mt
#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_fix_backtrace_arch.dpatch by Michael Terry <mte...@ubuntu.com>
##
## DP: Fixes compilation on non-i386 and non-amd64 architectures
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
sphinxsearch-0.9.9+2.0.1beta~/src/sphinxutils.cpp
sphinxsearch-0.9.9+2.0.1beta/src/sphinxutils.cpp
--- sphinxsearch-0.9.9+2.0.1beta~/src/sphinxutils.cpp 2011-11-30
09:38:47.000000000 -0500
+++ sphinxsearch-0.9.9+2.0.1beta/src/sphinxutils.cpp 2011-11-30
09:44:14.785709374 -0500
@@ -1401,6 +1401,7 @@
}
}
+#ifdef SIGRETURN_FRAME_OFFSET
sphSafeInfo ( iFD, "Stack looks OK, attempting backtrace." );
BYTE** pNewFP;
@@ -1418,6 +1419,7 @@
if ( !bOk )
sphSafeInfo ( iFD, "Something wrong in frame pointers,
backtrace failed (fp=%p)", pNewFP );
+#endif
break;
}
