Author: bdrewery
Date: Thu May 19 21:41:35 2016
New Revision: 300233
URL: https://svnweb.freebsd.org/changeset/base/300233
Log:
Allow MK_ overrides.
This is a direct commit to stable.
This was done in head in r264661 and is needed to force certain options off
for ports.
PR: D6271
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/share/mk/bsd.own.mk
Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk Thu May 19 21:08:33 2016
(r300232)
+++ stable/10/share/mk/bsd.own.mk Thu May 19 21:41:35 2016
(r300233)
@@ -483,9 +483,6 @@ __DEFAULT_NO_OPTIONS+=HYPERV
.if defined(WITH_${var}) && defined(WITHOUT_${var})
.error WITH_${var} and WITHOUT_${var} can't both be set.
.endif
-.if defined(MK_${var})
-.error MK_${var} can't be set by a user.
-.endif
.if defined(WITHOUT_${var})
MK_${var}:= no
.else
@@ -501,9 +498,6 @@ MK_${var}:= yes
.if defined(WITH_${var}) && defined(WITHOUT_${var})
.error WITH_${var} and WITHOUT_${var} can't both be set.
.endif
-.if defined(MK_${var})
-.error MK_${var} can't be set by a user.
-.endif
.if defined(WITH_${var})
MK_${var}:= yes
.else
@@ -621,9 +615,6 @@ MK_TESTS:= no
.if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT)
.error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set.
.endif
-.if defined(MK_${var}_SUPPORT)
-.error MK_${var}_SUPPORT can't be set by a user.
-.endif
.if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"
MK_${var}_SUPPORT:= no
.else
@@ -640,9 +631,6 @@ MK_${var}_SUPPORT:= yes
.if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H})
.error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set.
.endif
-.if defined(MK_${vv:H})
-.error MK_${vv:H} can't be set by a user.
-.endif
.if defined(WITH_${vv:H})
MK_${vv:H}:= yes
.elif defined(WITHOUT_${vv:H})
@@ -661,9 +649,6 @@ MK_${vv:H}:= ${MK_${vv:T}}
.if defined(WITH_${var}) && defined(WITHOUT_${var})
.error WITH_${var} and WITHOUT_${var} can't both be set.
.endif
-.if defined(MK_${var})
-.error MK_${var} can't be set by a user.
-.endif
.if ${COMPILER_FEATURES:Mc++11}
.if defined(WITHOUT_${var})
MK_${var}:= no
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
