Date: Thu, 18 Sep 2008 10:51:11 +0200 From: Alex Dupre <ale@FreeBSD.org> To: John Baldwin <jhb@freebsd.org> Cc: ports@freebsd.org, Doug Barton <dougb@freebsd.org> Subject: Re: OPTIONS handling doesn't seem to work fully in dependencies anymore Message-ID: <48D2167F.3040203@FreeBSD.org> In-Reply-To: <200809171303.05759.jhb@freebsd.org> References: <200809151036.19674.jhb@freebsd.org> <48D03248.1040109@FreeBSD.org> <48D0A683.9020802@FreeBSD.org> <200809171303.05759.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------050206000609000202030101
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
John Baldwin ha scritto:
> It used to work.
I was thinking the same thing, but actually it never worked in that way.
> I was just guessing about how it might not be working now
> based on reading the existing logic. I have not delved into the history to
> see what has changed.
The attached patch should solve this erratic behavior.
--
Alex Dupre
--------------050206000609000202030101
Content-Type: text/plain;
name="bsd.port.mk.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="bsd.port.mk.diff"
--- bsd.port.mk.orig 2008-09-18 10:31:14.000000000 +0200
+++ bsd.port.mk 2008-09-18 10:46:02.000000000 +0200
@@ -3234,7 +3234,7 @@
# target or not.
#
################################################################
-.if (!defined(OPTIONS) || defined(CONFIG_DONE) || \
+.if (!defined(OPTIONS) || defined(CONFIG_DONE_${UNIQUENAME:U}) || \
defined(PACKAGE_BUILDING) || defined(BATCH))
_OPTIONS_OK=yes
.endif
@@ -4169,7 +4169,7 @@
${target}: ${${target:U}_COOKIE}
.elif !target(${target})
${target}: config-conditional
- @cd ${.CURDIR} && ${MAKE} CONFIG_DONE=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
+ @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:U}=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
.elif target(${target}) && defined(IGNORE)
.endif
--------------050206000609000202030101--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?48D2167F.3040203>