mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-misc/sphinx: remove unused patch
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
committed by
Patrice Clement
parent
5a354645c8
commit
29e66f501f
@@ -1,23 +0,0 @@
|
||||
Darwin8 has no backtrace functionalities yet
|
||||
|
||||
--- src/searchd.cpp
|
||||
+++ src/searchd.cpp
|
||||
@@ -1291,6 +1291,10 @@
|
||||
__asm __volatile__ ( "movq %%rbp,%0":"=r"(pFramePointer):"r"(pFramePointer) );
|
||||
#endif
|
||||
|
||||
+#ifndef SIGRETURN_FRAME_OFFSET
|
||||
+ sphLogFatal ( "Cannot get stack frame pointer on this architecture" );
|
||||
+#else
|
||||
+
|
||||
if ( !pFramePointer )
|
||||
{
|
||||
sphLogFatal ( "Frame pointer is null. Unable to backtrace the stack. Did you build the searchd with -fomit-frame-pointer?" );
|
||||
@@ -1329,6 +1333,7 @@
|
||||
if ( !bOk )
|
||||
sphWarning ( "Something wrong in frame pointers. BackTrace failed (failed FP was %p)", pNewFP );
|
||||
else
|
||||
+#endif
|
||||
#endif // !HAVE_BACKTRACE
|
||||
sphInfo ( "Stack trace seems to be succesfull. Now you have to resolve the numbers above and attach resolved values to the bugreport. See the section about resolving in the documentation" );
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
On Darwin, the linker doesn't like it when vsnprintf is prefixed by an
|
||||
underscore. This obviously is an error, since it's only necessary for
|
||||
Windows. Add an extra guard, such that vsnprintf is left alone.
|
||||
|
||||
--- api/libsphinxclient/sphinxclient.c
|
||||
+++ api/libsphinxclient/sphinxclient.c
|
||||
@@ -13,6 +13,7 @@
|
||||
// did not, you can find it at http://www.gnu.org/
|
||||
//
|
||||
|
||||
+#if defined(_MSC_VER)
|
||||
#if _MSC_VER>=1400
|
||||
// VS 2005 and above
|
||||
#define _CRT_SECURE_NO_DEPRECATE 1
|
||||
@@ -21,6 +22,7 @@
|
||||
// VS 2003 and below
|
||||
#define vsnprintf _vsnprintf
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
@@ -1,26 +0,0 @@
|
||||
Part of upstream fix:
|
||||
http://code.google.com/p/sphinxsearch/source/detail?r=2423
|
||||
|
||||
--- api/libsphinxclient/sphinxclient.c.~1~ 2010-07-15 13:05:40.000000000 +0200
|
||||
+++ api/libsphinxclient/sphinxclient.c 2010-11-09 19:55:28.964939046 +0100
|
||||
@@ -1268,7 +1268,11 @@
|
||||
static sphinx_bool net_write ( int fd, const char * bytes, int len, sphinx_client * client )
|
||||
{
|
||||
int res;
|
||||
+#if defined(_WIN32) || defined(SO_NOSIGPIPE)
|
||||
res = send ( fd, bytes, len, 0 );
|
||||
+#else
|
||||
+ res = send ( fd, bytes, len, MSG_NOSIGNAL );
|
||||
+#endif
|
||||
|
||||
if ( res<0 )
|
||||
{
|
||||
@@ -1354,7 +1358,7 @@
|
||||
}
|
||||
|
||||
optval = 1;
|
||||
-#ifndef _WIN32
|
||||
+#if defined(SO_NOSIGPIPE)
|
||||
if ( setsockopt ( sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&optval, (socklen_t)sizeof(optval) ) < 0 )
|
||||
{
|
||||
set_error ( client, "setsockopt() failed: %s", sock_error() );
|
||||
@@ -1,35 +0,0 @@
|
||||
link against required libraries
|
||||
include sys/fcntl.h for F_[SG]ET constants
|
||||
don't try to use an undefined constant
|
||||
|
||||
--- api/libsphinxclient/configure.in
|
||||
+++ api/libsphinxclient/configure.in
|
||||
@@ -33,6 +33,9 @@
|
||||
dnl Checks for header files.
|
||||
AC_CHECK_HEADERS(string.h strings.h unistd.h stdint.h)
|
||||
|
||||
+AC_CHECK_LIB([nsl], gethostbyname)
|
||||
+AC_CHECK_LIB([socket], connect)
|
||||
+
|
||||
DEFAULT_INSTALL_PREFIX="/usr/local"
|
||||
|
||||
AC_ARG_ENABLE(debug,
|
||||
--- api/libsphinxclient/sphinxclient.c
|
||||
+++ api/libsphinxclient/sphinxclient.c
|
||||
@@ -57,6 +57,7 @@
|
||||
#include <netdb.h>
|
||||
#include <errno.h>
|
||||
#include <sys/un.h>
|
||||
+ #include <sys/fcntl.h>
|
||||
#endif
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
@@ -1280,7 +1281,7 @@
|
||||
static sphinx_bool net_write ( int fd, const char * bytes, int len, sphinx_client * client )
|
||||
{
|
||||
int res;
|
||||
-#if defined(_WIN32) || defined(SO_NOSIGPIPE)
|
||||
+#if defined(_WIN32) || defined(SO_NOSIGPIPE) || !defined(MSG_NOSIGNAL)
|
||||
res = send ( fd, bytes, len, 0 );
|
||||
#else
|
||||
res = send ( fd, bytes, len, MSG_NOSIGNAL );
|
||||
@@ -1,29 +0,0 @@
|
||||
--- a/src/sphinxexpr.cpp
|
||||
+++ b/src/sphinxexpr.cpp
|
||||
@@ -1796,7 +1796,7 @@ public:
|
||||
/// evaluate arg, return interval id
|
||||
virtual int IntEval ( const CSphMatch & tMatch ) const
|
||||
{
|
||||
- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
|
||||
+ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
|
||||
ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here
|
||||
if ( val<this->m_dValues[i] )
|
||||
return i;
|
||||
@@ -1827,7 +1827,7 @@ public:
|
||||
/// evaluate arg, return interval id
|
||||
virtual int IntEval ( const CSphMatch & tMatch ) const
|
||||
{
|
||||
- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
|
||||
+ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
|
||||
ARRAY_FOREACH ( i, m_dTurnPoints )
|
||||
if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) )
|
||||
return i;
|
||||
@@ -1873,7 +1873,7 @@ public:
|
||||
/// evaluate arg, check if the value is within set
|
||||
virtual int IntEval ( const CSphMatch & tMatch ) const
|
||||
{
|
||||
- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
|
||||
+ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
|
||||
return this->m_dValues.BinarySearch ( val )!=NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user