diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-11-09 20:31:02 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-11-09 20:31:02 +0000 |
| commit | 47c09f600d997b9c1b18231032ceb4b79a654007 (patch) | |
| tree | 1151d6894d95a89b18dc207676f5a62227b89bc7 /app-misc/sphinx/files | |
| parent | Use mlocate as default instead of slocate wrt #338380. (diff) | |
| download | gentoo-2-47c09f600d997b9c1b18231032ceb4b79a654007.tar.gz gentoo-2-47c09f600d997b9c1b18231032ceb4b79a654007.tar.bz2 gentoo-2-47c09f600d997b9c1b18231032ceb4b79a654007.zip | |
Build the libsphinxclient library as well and fix prefix issues with patches from grobian. This fixes bug 328213.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/sphinx/files')
| -rw-r--r-- | app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch b/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch new file mode 100644 index 000000000000..a713a891f21d --- /dev/null +++ b/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch @@ -0,0 +1,26 @@ +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() ); |