From owner-svn-ports-all@FreeBSD.ORG Tue May 27 12:13:06 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 5F483E1E; Tue, 27 May 2014 12:13:06 +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 4CFC5221D; Tue, 27 May 2014 12:13:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RCD6ls077565; Tue, 27 May 2014 12:13:06 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4RCD6lx077564; Tue, 27 May 2014 12:13:06 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405271213.s4RCD6lx077564@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 27 May 2014 12:13:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355494 - head/Mk/Uses 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 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: Tue, 27 May 2014 12:13:06 -0000 Author: bapt Date: Tue May 27 12:13:05 2014 New Revision: 355494 URL: http://svnweb.freebsd.org/changeset/ports/355494 QAT: https://qat.redports.org/buildarchive/r355494/ Log: scons expect lots of variables to be set as arguments Modified: head/Mk/Uses/scons.mk Modified: head/Mk/Uses/scons.mk ============================================================================== --- head/Mk/Uses/scons.mk Tue May 27 12:11:13 2014 (r355493) +++ head/Mk/Uses/scons.mk Tue May 27 12:13:05 2014 (r355494) @@ -22,9 +22,11 @@ CPPPATH?= ${LOCALBASE}/include SCONS= ${LOCALBASE}/bin/scons BUILD_DEPENDS+= ${SCONS}:${PORTSDIR}/devel/scons MAKE_CMD?= ${SCONS} -MAKE_ENV+= PKGCONFIGDIR="${PKGCONFIGDIR}" \ - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ - LIBPATH="${LIBPATH}" CPPPATH="${CPPPATH}" +MAKE_ARGS+= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ + CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \ + CC="${CC}" CXX="${CXX}" + .if !defined(NO_STAGE) MAKE_ARGS+= ${DESTDIRNAME:tl}=${STAGEDIR} .endif