Date: Thu, 19 May 2016 22:55:27 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415532 - head/Mk Message-ID: <201605192255.u4JMtRhx042870@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu May 19 22:55:26 2016 New Revision: 415532 URL: https://svnweb.freebsd.org/changeset/ports/415532 Log: Re-enable code from r415530 with safer MAKE_ENV support. PR: D6271 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 22:24:59 2016 (r415531) +++ head/Mk/bsd.port.mk Thu May 19 22:55:26 2016 (r415532) @@ -1641,13 +1641,13 @@ 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 0 && ((${OSVERSION} >= 903510 && ${OSVERSION} < 1000000) || \ +.if (${OSVERSION} >= 903510 && ${OSVERSION} < 1000000) || \ (${OSVERSION} >= 1003503 && ${OSVERSION} < 1100000) || \ - ${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 +MAKE_ENV+= MK_DEBUG_FILES=no +MAKE_ENV+= MK_KERNEL_SYMBOLS=no .else MAKE_ENV+= WITHOUT_DEBUG_FILES=yes MAKE_ENV+= WITHOUT_KERNEL_SYMBOLS=yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605192255.u4JMtRhx042870>