From owner-svn-ports-all@FreeBSD.ORG Fri Aug 22 19:33:21 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 6579DED0; Fri, 22 Aug 2014 19:33:21 +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 36E253B1C; Fri, 22 Aug 2014 19:33:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7MJXL7N020215; Fri, 22 Aug 2014 19:33:21 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7MJXKAw020213; Fri, 22 Aug 2014 19:33:20 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408221933.s7MJXKAw020213@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 22 Aug 2014 19:33:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365690 - in head/devel/jsoncpp: . files X-SVN-Group: ports-head 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.18-1 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: Fri, 22 Aug 2014 19:33:21 -0000 Author: bdrewery Date: Fri Aug 22 19:33:20 2014 New Revision: 365690 URL: http://svnweb.freebsd.org/changeset/ports/365690 QAT: https://qat.redports.org/buildarchive/r365690/ Log: - Fix CXX not being respected. This original fix seemed to work only because scons tries c++, then g++. If you had g++ installed then it would use that regardless of CXX. Just pull CXX out of the environment intead. Modified: head/devel/jsoncpp/Makefile head/devel/jsoncpp/files/patch-SConstruct Modified: head/devel/jsoncpp/Makefile ============================================================================== --- head/devel/jsoncpp/Makefile Fri Aug 22 19:16:28 2014 (r365689) +++ head/devel/jsoncpp/Makefile Fri Aug 22 19:33:20 2014 (r365690) @@ -17,9 +17,6 @@ USE_LDCONFIG= yes MAKE_ARGS= platform=linux-gcc -post-patch: - @${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/SConstruct - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp (cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/) Modified: head/devel/jsoncpp/files/patch-SConstruct ============================================================================== --- head/devel/jsoncpp/files/patch-SConstruct Fri Aug 22 19:16:28 2014 (r365689) +++ head/devel/jsoncpp/files/patch-SConstruct Fri Aug 22 19:33:20 2014 (r365690) @@ -1,5 +1,5 @@ ---- ./SConstruct.orig 2014-01-21 02:29:19.000000000 -0200 -+++ ./SConstruct 2014-01-21 02:29:28.000000000 -0200 +--- ./SConstruct.orig 2014-08-22 14:25:14.780951671 -0500 ++++ ./SConstruct 2014-08-22 14:25:37.478948513 -0500 @@ -26,7 +26,7 @@ if platform == 'linux-gcc': CXX = 'g++' # not quite right, but env is not yet available. @@ -9,3 +9,11 @@ platform = 'linux-gcc-%s' %version print "Using platform '%s'" %platform LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '') +@@ -121,6 +121,7 @@ + env.Tool( 'default' ) + env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" ) + env['SHARED_LIB_ENABLED'] = True ++ env['CXX'] = os.environ['CXX'] + else: + print "UNSUPPORTED PLATFORM." + env.Exit(1)