diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-01-20 07:42:00 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-01-20 07:42:00 +0000 |
commit | c26c9eb22bf21af80cbe8814484de105b7f0d843 (patch) | |
tree | 57bdfc27bd86fc42b75254b2893f33b07364ee4c /Mk/bsd.port.mk | |
parent | 9769e5a1fc4a0db107ca4b454affb06a1dcc7661 (diff) | |
download | ports-c26c9eb22bf21af80cbe8814484de105b7f0d843.tar.gz ports-c26c9eb22bf21af80cbe8814484de105b7f0d843.zip |
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>
Notes
Notes:
svn path=/head/; revision=340369
Diffstat (limited to 'Mk/bsd.port.mk')
-rw-r--r-- | Mk/bsd.port.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b62415495fc7..14a0885c0aae 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1821,6 +1821,11 @@ RUN_DEPENDS+= ${_GL_${_component}_RUN_DEPENDS} .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) |