[Midnightbsd-cvs] mports [17509] trunk/Mk/components/options.mk: put a guard around the options generation so that it runs only once.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Sep 26 19:05:52 EDT 2014
Revision: 17509
http://svnweb.midnightbsd.org/mports/?rev=17509
Author: laffer1
Date: 2014-09-26 19:05:50 -0400 (Fri, 26 Sep 2014)
Log Message:
-----------
put a guard around the options generation so that it runs only once. This solves a problem where EXTRA_PATCHES gets run twice
Modified Paths:
--------------
trunk/Mk/components/options.mk
Modified: trunk/Mk/components/options.mk
===================================================================
--- trunk/Mk/components/options.mk 2014-09-26 22:56:49 UTC (rev 17508)
+++ trunk/Mk/components/options.mk 2014-09-26 23:05:50 UTC (rev 17509)
@@ -1,5 +1,3 @@
-#-*- tab-width: 4; -*-
-#
# $MidnightBSD$
#
# options.mk -- The options component
@@ -216,6 +214,8 @@
.endif
###
+.if !defined(ONETIMERUNTHROUGH)
+ONETIMERUNTHROUGH= yes
.for opt in ${COMPLETE_OPTIONS_LIST} ${OPTIONS_SLAVE}
# PLIST_SUB
PLIST_SUB?=
@@ -289,8 +289,8 @@
. endfor
. endif
.endfor
+.endif #onetime run through
-
.if defined(_POSTMKINCLUDED)
.if !target(pre-check-config)
More information about the Midnightbsd-cvs
mailing list