Date: Wed, 12 Oct 2016 12:19:55 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423859 - head/Mk Message-ID: <201610121219.u9CCJteC075757@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Oct 12 12:19:55 2016 New Revision: 423859 URL: https://svnweb.freebsd.org/changeset/ports/423859 Log: Change the way opt_USE is parsed. This makes it possible to have: opt_USE= ldconfig=${PREFIX}/lib/foo/bar Before this, it would have ended up doing USE_LDCONFIG=/lib/foo/bar, without ${PREFIX}. Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D8169 Modified: head/Mk/bsd.options.mk (contents, props changed) Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Wed Oct 12 11:52:27 2016 (r423858) +++ head/Mk/bsd.options.mk Wed Oct 12 12:19:55 2016 (r423859) @@ -495,9 +495,9 @@ SUB_LIST:= ${SUB_LIST} ${opt}="@comment . if ${PORT_OPTIONS:M${opt}} . if defined(${opt}_USE) -. for option in ${${opt}_USE} -_u= ${option:C/=.*//g} -USE_${_u:tu}+= ${option:C/.*=//g:C/,/ /g} +. for option in ${${opt}_USE:C/=.*//:O:u} +_u= ${option} +USE_${_u:tu}+= ${${opt}_USE:M${option}=*:C/.*=//g:C/,/ /g} . endfor . endif . if defined(${opt}_VARS) @@ -545,9 +545,9 @@ _OPTIONS_${_target}:= ${_OPTIONS_${_targ . endfor . else . if defined(${opt}_USE_OFF) -. for option in ${${opt}_USE_OFF} -_u= ${option:C/=.*//g} -USE_${_u:tu}+= ${option:C/.*=//g:C/,/ /g} +. for option in ${${opt}_USE_OFF:C/=.*//:O:u} +_u= ${option} +USE_${_u:tu}+= ${${opt}_USE_OFF:M${option}=*:C/.*=//g:C/,/ /g} . endfor . endif . if defined(${opt}_VARS_OFF)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610121219.u9CCJteC075757>