Date: Mon, 20 Jan 2014 07:42:00 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340369 - head/Mk Message-ID: <201401200742.s0K7g0kF045373@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jan 20 07:42:00 2014 New Revision: 340369 URL: http://svnweb.freebsd.org/changeset/ports/340369 QAT: https://qat.redports.org/buildarchive/r340369/ Log: NO_STAGEd ports will fail if STAGEDIR is defined. Undefined STAGEDIR if already set from make.conf Raise an error if set from command line (which cannot be undefined) PR: ports/182972 Submitted by: "Scot W. Hetzel" <swhetzel@gmail.com> Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Jan 20 07:32:06 2014 (r340368) +++ head/Mk/bsd.port.mk Mon Jan 20 07:42:00 2014 (r340369) @@ -1821,6 +1821,11 @@ RUN_DEPENDS+= ${_GL_${_component}_RUN_DE .if !defined(NO_STAGE) .include "${PORTSDIR}/Mk/bsd.stage.mk" +.else +# Ignore STAGEDIR if set from make.conf +.undef STAGEDIR +# From command line it is impossible to undefined so we must raise an error +IGNORE= Do not define STAGEDIR in command line .endif .if defined(WITH_PKGNG)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401200742.s0K7g0kF045373>