svn commit: r442732 - in branches/2017Q2/Mk: . Uses
Bryan Drewery
bdrewery at FreeBSD.org
Tue Jun 6 00:56:58 UTC 2017
Author: bdrewery
Date: Tue Jun 6 00:56:57 2017
New Revision: 442732
URL: https://svnweb.freebsd.org/changeset/ports/442732
Log:
MFH: r442729 r442730
r442729:
No quoting needed here.
r442730:
Don't pass the default version in DEPENDS_ARGS.
This greatly simplifies handling for Poudriere.
With hat: portmgr
Approved by: portmgr (implicit)
Modified:
branches/2017Q2/Mk/Uses/python.mk
branches/2017Q2/Mk/bsd.ruby.mk
Directory Properties:
branches/2017Q2/ (props changed)
Modified: branches/2017Q2/Mk/Uses/python.mk
==============================================================================
--- branches/2017Q2/Mk/Uses/python.mk Tue Jun 6 00:47:24 2017 (r442731)
+++ branches/2017Q2/Mk/Uses/python.mk Tue Jun 6 00:56:57 2017 (r442732)
@@ -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: branches/2017Q2/Mk/bsd.ruby.mk
==============================================================================
--- branches/2017Q2/Mk/bsd.ruby.mk Tue Jun 6 00:47:24 2017 (r442731)
+++ branches/2017Q2/Mk/bsd.ruby.mk Tue Jun 6 00:56:57 2017 (r442732)
@@ -267,7 +267,9 @@ RUBY_SHLIBVER?= ${RUBY_VER:S/.//}
RUBY_CONFIGURE_ARGS+= --program-prefix=""
-DEPENDS_ARGS+= RUBY_VER="${RUBY_VER}"
+.if ${RUBY_VER} != ${RUBY_DEFAULT_VER}
+DEPENDS_ARGS+= RUBY_VER=${RUBY_VER}
+.endif
RUBY_CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
More information about the svn-ports-branches
mailing list