Attachment 177250 Details for Bug 214699 – Proposed patch

[patch] Proposed patch

xapian-core-1.2.24-fbsd9.diff (text/plain), 1.66 KB, created by Raphael Kubo da Costa on 2016-11-21 21:12:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2016-11-21 21:12:52 UTC

Size: 1.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 426753)
>+++ Makefile	(working copy)
>@@ -28,9 +28,16 @@
> 
> SSE2_CONFIGURE_ENABLE=	sse
> 
>+.include <bsd.port.pre.mk>
>+
>+# FreeBSD 9 does not have SOCK_CLOEXEC.
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
>+EXTRA_PATCHES=	${FILESDIR}/extrapatch-backends_flint__lock.cc
>+.endif
>+
> post-install:
> .for file in copydatabase delve quest
> 	${INSTALL_PROGRAM} ${WRKSRC}/examples/.libs/${file} ${STAGEDIR}${PREFIX}/bin/xapian-${file}
> .endfor
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/extrapatch-backends_flint__lock.cc
>===================================================================
>--- files/extrapatch-backends_flint__lock.cc	(nonexistent)
>+++ files/extrapatch-backends_flint__lock.cc	(working copy)
>@@ -0,0 +1,16 @@
>+FreeBSD 9 does not have SOCK_CLOEXEC. Define it to 0, as the code already deals
>+with it.
>+Xapian 1.4 has a safesyssocket.h that takes care of this.
>+--- backends/flint_lock.cc.orig	2016-09-16 01:59:15 UTC
>++++ backends/flint_lock.cc
>+@@ -59,6 +59,10 @@ using namespace std;
>+ # endif
>+ #endif
>+ 
>++#ifndef SOCK_CLOEXEC
>++#define SOCK_CLOEXEC 0
>++#endif
>++
>+ FlintLock::reason
>+ FlintLock::lock(bool exclusive, string & explanation) {
>+     // Currently we only support exclusive locks.
>
>Property changes on: files/extrapatch-backends_flint__lock.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 214699: 177250