Attachment 145584 Details for Bug 192540 – patch to Mk

[patch] patch to Mk

patch-Mk-global-options.patch (text/plain), 1.37 KB, created by Yuri Victorovich on 2014-08-09 22:53:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2014-08-09 22:53:07 UTC

Size: 1.37 KB

patch

obsolete

>--- Mk/bsd.options.mk	(revision 364455)
>+++ Mk/bsd.options.mk	(working copy)
>@@ -9,6 +9,8 @@
> # OPTIONS_DEFAULT_${ARCH}	- List of options activated by default for a
> #				  given arch
> #
>+# OPTIONS_GLOBAL_SET		- List of options that were overridden by make.conf
>+# OPTIONS_GLOBAL_UNSET		- List of options that were overridden by make.conf
> # ${OPTION}_DESC		- Description of the ${OPTION}
> #
> # OPTIONS_SINGLE		- List of single-choice grouped options: 1 and
>@@ -228,6 +230,18 @@
> NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
> .  endfor
> 
>+## Sets of optins that were globally overridden
>+.  for opt in ${OPTIONS_UNSET}
>+.    if !empty(ALL_OPTIONS:M${opt})
>+OPTIONS_GLOBAL_UNSET+=	${opt}
>+.    endif
>+.  endfor
>+.  for opt in ${OPTIONS_SET}
>+.    if !empty(ALL_OPTIONS:M${opt})
>+OPTIONS_GLOBAL_SET+=	${opt}
>+.    endif
>+.  endfor
>+
> # XXX To remove once UNIQUENAME will be removed
> ## Set the options specified per-port (set by user in make.conf)
> .  for opt in ${${UNIQUENAME}_SET}
>--- Mk/bsd.port.mk	(revision 364455)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -5897,6 +5897,9 @@
> pre-config:
> D4P_ENV=	PKGNAME="${PKGNAME}" \
> 		PORT_OPTIONS="${PORT_OPTIONS}" \
>+		OPTIONS_DEFAULT="${OPTIONS_DEFAULT}" \
>+		OPTIONS_GLOBAL_UNSET="${OPTIONS_GLOBAL_UNSET}" \
>+		OPTIONS_GLOBAL_SET="${OPTIONS_GLOBAL_SET}" \
> 		ALL_OPTIONS="${ALL_OPTIONS}" \
> 		OPTIONS_MULTI="${OPTIONS_MULTI}" \
> 		OPTIONS_SINGLE="${OPTIONS_SINGLE}" \

Actions: View | Diff

Attachments on bug 192540: 145584 | 145585