From owner-svn-ports-head@freebsd.org Thu May 19 22:06:29 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3330B42964; Thu, 19 May 2016 22:06:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B8701FBB; Thu, 19 May 2016 22:06:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4JM6Sq2027456; Thu, 19 May 2016 22:06:28 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4JM6S5O027455; Thu, 19 May 2016 22:06:28 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201605192206.u4JM6S5O027455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 19 May 2016 22:06:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415530 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 May 2016 22:06:29 -0000 Author: bdrewery Date: Thu May 19 22:06:28 2016 New Revision: 415530 URL: https://svnweb.freebsd.org/changeset/ports/415530 Log: Use MK_* to prevent debug files if possible. A longstanding bug with the base /usr/share/mk files is that /etc/src.conf *does* get pulled in when building ports which use /usr/share/mk. This despite the documentation saying it is only used for "the FreeBSD tree". If users have a WITH_DEBUG_FILES=yes in their src.conf then the previous WITHOUT_DEBUG_FILES=yes would hit an error. Fixing pulling in src.conf is risky. MK_* overrides work fine here after recent stable/9 and stable/10 updates. If you run into the WITH_ vs WITHOUT_ problem on a release build then you can protect your src.conf value with something like: .if !${.CURDIR:M*ports*} WITH_DEBUG_FILES=yes .endif PR: D6271 With hat: portmgr Sponsored by: EMC / Isilon Storage Division Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu May 19 21:16:11 2016 (r415529) +++ head/Mk/bsd.port.mk Thu May 19 22:06:28 2016 (r415530) @@ -1638,10 +1638,20 @@ INSTALL_TARGET:= ${INSTALL_TARGET:S/^ins # XXX PIE support to be added here MAKE_ENV+= NO_PIE=yes +# We prefer to pass MK_*=no but it was only supported after a certain +# revision. Passing WITHOUT_* may conflict with a make.conf or src.conf's +# WITH_* value. Note that ports *do* pull in src.conf. +.if (${OSVERSION} >= 903510 && ${OSVERSION} < 1000000) || \ + (${OSVERSION} >= 1003503 && ${OSVERSION} < 1100000) || \ + ${OSVERSION} >= 1100000 # We will control debug files. Don't let builds that use /usr/share/mk # split out debug symbols since the plist won't know to expect it. +MAKE_ARGS+= MK_DEBUG_FILES=no +MAKE_ARGS+= MK_KERNEL_SYMBOLS=no +.else MAKE_ENV+= WITHOUT_DEBUG_FILES=yes MAKE_ENV+= WITHOUT_KERNEL_SYMBOLS=yes +.endif .if defined(NOPORTDOCS) PLIST_SUB+= PORTDOCS="@comment "