From owner-svn-ports-all@FreeBSD.ORG Thu Apr 10 18:52:04 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4555E885; Thu, 10 Apr 2014 18:52:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 329B716AF; Thu, 10 Apr 2014 18:52:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3AIq4Qd081619; Thu, 10 Apr 2014 18:52:04 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3AIq41i081618; Thu, 10 Apr 2014 18:52:04 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404101852.s3AIq41i081618@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 10 Apr 2014 18:52:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350826 - branches/2014Q2/net/xorp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 18:52:04 -0000 Author: amdmi3 Date: Thu Apr 10 18:52:03 2014 New Revision: 350826 URL: http://svnweb.freebsd.org/changeset/ports/350826 QAT: https://qat.redports.org/buildarchive/r350826/ Log: MFH: r349971 - Fix build with clang Approved by: portmgr Modified: branches/2014Q2/net/xorp/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/net/xorp/Makefile ============================================================================== --- branches/2014Q2/net/xorp/Makefile Thu Apr 10 18:38:13 2014 (r350825) +++ branches/2014Q2/net/xorp/Makefile Thu Apr 10 18:52:03 2014 (r350826) @@ -19,8 +19,7 @@ CONFLICTS_INSTALL= xorp-devel-* EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions -s /^xorp/${DISTNAME}/ GROUPS= xorp -USES= ncurses scons shebangfix -USE_BZIP2= yes +USES= tar:bzip2 ncurses scons shebangfix compiler:env USE_OPENSSL= yes USE_PYTHON_BUILD= 2 USE_RC_SUBR= xorp @@ -41,7 +40,7 @@ TCP_RPC_DESC= Use TCP as RPC transport ( MAKE_ARGS= prefix=${PREFIX} enable_boost=1 -.include +.include .if ${PORT_OPTIONS:MOPTIMIZE} MAKE_ARGS+= optimize=highest @@ -77,8 +76,11 @@ MAKE_ARGS+= transport=local post-patch: ${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/SConstruct +.if ${COMPILER_TYPE} == "clang" + ${REINPLACE_CMD} 's,-Werror,& -Wno-unused-function,' ${WRKSRC}/SConstruct +.endif post-install: ${CP} -p ${WRKSRC}/${XORP_SAMPLECONF} ${STAGEDIR}${PREFIX}/etc/xorp.conf.sample -.include +.include