Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 May 2016 06:34:32 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r415310 - head/databases/mongodb32
Message-ID:  <201605160634.u4G6YWl0063547@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Mon May 16 06:34:32 2016
New Revision: 415310
URL: https://svnweb.freebsd.org/changeset/ports/415310

Log:
  databases/mongodb32: use clang from base in 11-CURRENT
  
  Clang has been upgrade to 3.8 in 11-CURRENT, so use it.
  
  PR:		208276
  Submitted by:	Eric Camachat <eric@camachat.org>
  Approved by:	brendan+freebsd@bbqsrc.net (maintainer)

Modified:
  head/databases/mongodb32/Makefile

Modified: head/databases/mongodb32/Makefile
==============================================================================
--- head/databases/mongodb32/Makefile	Mon May 16 06:22:23 2016	(r415309)
+++ head/databases/mongodb32/Makefile	Mon May 16 06:34:32 2016	(r415310)
@@ -17,18 +17,11 @@ COMMENT=	Distributed document-oriented "
 LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
-# Bugs when compiled with < Clang 3.7
-#  - https://jira.mongodb.org/browse/SERVER-21217
-#  - https://jira.mongodb.org/browse/SERVER-22740
-BUILD_DEPENDS=	${LOCALBASE}/bin/clang37:lang/clang37
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo
 
-CPP=	${LOCALBASE}/bin/clang-cpp37
-CC=	${LOCALBASE}/bin/clang37
-CXX=	${LOCALBASE}/bin/clang++37
 CHOSEN_COMPILER_TYPE=	clang
 
 ONLY_FOR_ARCHS=	amd64
@@ -41,10 +34,10 @@ OPTIONS_DEFAULT=	SASL SSL
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
-SSL_USE=	openssl=yes
+SSL_USE=	yes
 SSL_MAKE_ARGS=	--ssl
 
-USES=		cpe execinfo python:build scons
+USES=		compiler cpe execinfo python:build scons
 
 MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
 		--use-system-pcre --use-system-snappy \
@@ -64,6 +57,15 @@ TEST_TARGET=	unittests
 # Cannot be built
 IGNORE=	unsupported on FreeBSD 10.1 or older
 .endif
+# Bugs when compiled with < Clang 3.7
+#  - https://jira.mongodb.org/browse/SERVER-21217
+#  - https://jira.mongodb.org/browse/SERVER-22740
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 37
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang37:${PORTSDIR}/lang/clang37
+CPP=	${LOCALBASE}/bin/clang-cpp37
+CC=	${LOCALBASE}/bin/clang37
+CXX=	${LOCALBASE}/bin/clang++37
+.endif
 
 post-install:
 .for f in mongo mongod mongoperf mongos mongosniff



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605160634.u4G6YWl0063547>