Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/sphinx/files: sphinx-2.0.1_beta-solaris.patch
Date: Wed, 28 Sep 2011 10:40:21
Message-Id: 20110928104011.17B8B2004C@flycatcher.gentoo.org
1 grobian 11/09/28 10:40:11
2
3 Added: sphinx-2.0.1_beta-solaris.patch
4 Log:
5 Fixed for and marked ~sparc-solaris, ~sparc64-solaris
6
7 (Portage version: 2.2.01.19295-prefix/cvs/SunOS i386)
8
9 Revision Changes Path
10 1.1 app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch?rev=1.1&content-type=text/plain
14
15 Index: sphinx-2.0.1_beta-solaris.patch
16 ===================================================================
17 link against required libraries
18 include sys/fcntl.h for F_[SG]ET constants
19 don't try to use an undefined constant
20
21 --- api/libsphinxclient/configure.in
22 +++ api/libsphinxclient/configure.in
23 @@ -33,6 +33,9 @@
24 dnl Checks for header files.
25 AC_CHECK_HEADERS(string.h strings.h unistd.h stdint.h)
26
27 +AC_CHECK_LIB([nsl], gethostbyname)
28 +AC_CHECK_LIB([socket], connect)
29 +
30 DEFAULT_INSTALL_PREFIX="/usr/local"
31
32 AC_ARG_ENABLE(debug,
33 --- api/libsphinxclient/sphinxclient.c
34 +++ api/libsphinxclient/sphinxclient.c
35 @@ -57,6 +57,7 @@
36 #include <netdb.h>
37 #include <errno.h>
38 #include <sys/un.h>
39 + #include <sys/fcntl.h>
40 #endif
41
42 //////////////////////////////////////////////////////////////////////////
43 @@ -1280,7 +1281,7 @@
44 static sphinx_bool net_write ( int fd, const char * bytes, int len, sphinx_client * client )
45 {
46 int res;
47 -#if defined(_WIN32) || defined(SO_NOSIGPIPE)
48 +#if defined(_WIN32) || defined(SO_NOSIGPIPE) || !defined(MSG_NOSIGNAL)
49 res = send ( fd, bytes, len, 0 );
50 #else
51 res = send ( fd, bytes, len, MSG_NOSIGNAL );