Date: Mon, 25 Nov 2013 14:52:29 GMT From: Jan Beich <jbeich@tormail.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/184285: [bsd.port.mk][regression][patch] checking for STRIP doesn't work with OPTIONSng Message-ID: <201311251452.rAPEqT82006969@oldred.freebsd.org> Resent-Message-ID: <201311251500.rAPF00Z9043844@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184285
>Category: ports
>Synopsis: [bsd.port.mk][regression][patch] checking for STRIP doesn't work with OPTIONSng
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 25 15:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release:
>Organization:
>Environment:
>Description:
After bsd.options.mk was introduced the check for WITH_* and WITHOUT_*
moved from the beginning to the end of bsd.port.options.mk. However,
ports/153539 usage relies on STRIP being set early enough to be usable
before bsd.port.post.mk.
For example, this breaks stripping for bsd.gecko.mk and bsd.cmake.mk.
>How-To-Repeat:
$ env -i __MAKE_CONF= make WITH=DEBUG
CONFIGURE_ARGS=""
$ env -i __MAKE_CONF= make WITHOUT=DEBUG
CONFIGURE_ARGS=""
$ cat Makefile
PORTNAME= foo
OPTIONS_DEFINE= DEBUG
.include <bsd.port.options.mk>
.if !defined(STRIP) || ${STRIP} == ""
CONFIGURE_ARGS+=--disable-strip
.endif
all:
@${ECHO_MSG} CONFIGURE_ARGS=\"${CONFIGURE_ARGS}\"
.include <bsd.port.mk>
>Fix:
--- strip_check.diff begins here ---
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk (revision 334850)
+++ Mk/bsd.port.mk (working copy)
@@ -1317,13 +1317,13 @@ WITH_DEBUG= yes
.endif
.endif
+.include "${PORTSDIR}/Mk/bsd.options.mk"
+
# Reset value from bsd.own.mk.
.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
STRIP= #none
.endif
-.include "${PORTSDIR}/Mk/bsd.options.mk"
-
# Start of pre-makefile section.
.if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
--- strip_check.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311251452.rAPEqT82006969>