Date: Mon, 21 Nov 2016 21:26:59 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426759 - in head/databases/xapian-core: . files Message-ID: <201611212126.uALLQxT0063108@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Mon Nov 21 21:26:58 2016 New Revision: 426759 URL: https://svnweb.freebsd.org/changeset/ports/426759 Log: Unbreak the build on FreeBSD 9 after r426647. SOCK_CLOEXEC was introduced in FreeBSD 10, so define it to 0 on FreeBSD 9 (the code already handles this case). Xapian 1.4 has a safesyssocket.h that does the same thing. PR: 214699 Approved by: portmgr (antoine) Added: head/databases/xapian-core/files/extrapatch-backends_flint__lock.cc (contents, props changed) Modified: head/databases/xapian-core/Makefile Modified: head/databases/xapian-core/Makefile ============================================================================== --- head/databases/xapian-core/Makefile Mon Nov 21 21:26:02 2016 (r426758) +++ head/databases/xapian-core/Makefile Mon Nov 21 21:26:58 2016 (r426759) @@ -28,9 +28,16 @@ PORTDOCS= * 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> Added: head/databases/xapian-core/files/extrapatch-backends_flint__lock.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/xapian-core/files/extrapatch-backends_flint__lock.cc Mon Nov 21 21:26:58 2016 (r426759) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611212126.uALLQxT0063108>