Date: Tue, 6 Jun 2017 00:28:56 +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: r442730 - in head/Mk: . Uses Message-ID: <201706060028.v560Su9R090091@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Jun 6 00:28:56 2017 New Revision: 442730 URL: https://svnweb.freebsd.org/changeset/ports/442730 Log: Don't pass the default version in DEPENDS_ARGS. This greatly simplifies handling for Poudriere. With hat: portmgr Modified: head/Mk/Uses/python.mk head/Mk/bsd.ruby.mk Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Tue Jun 6 00:15:20 2017 (r442729) +++ head/Mk/Uses/python.mk Tue Jun 6 00:28:56 2017 (r442730) @@ -377,7 +377,8 @@ IGNORE= needs an unsupported version of Python # try to find a different one, if the passed version fits into # the supported version range. PYTHON_VERSION?= python${_PYTHON_VERSION} -.if !defined(PYTHON_NO_DEPENDS) +.if !defined(PYTHON_NO_DEPENDS) && \ + ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION} .endif Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Tue Jun 6 00:15:20 2017 (r442729) +++ head/Mk/bsd.ruby.mk Tue Jun 6 00:28:56 2017 (r442730) @@ -256,7 +256,9 @@ RUBY_SHLIBVER?= ${RUBY_VER:S/.//} RUBY_CONFIGURE_ARGS+= --program-prefix="" +.if ${RUBY_VER} != ${RUBY_DEFAULT_VER} DEPENDS_ARGS+= RUBY_VER=${RUBY_VER} +.endif RUBY_CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706060028.v560Su9R090091>