diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-06-06 08:28:56 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-06-06 08:28:56 +0800 |
| commit | 2a9110fe48a3efd319e2f64aff48178d062bf270 (patch) | |
| tree | 344e49055bdc4b5b9e69bd3cba1673078548de15 /Mk | |
| parent | 94f9b22546b7d4f6b7e4714004289655517b4d1e (diff) | |
| download | freebsd-ports-gnome-2a9110fe48a3efd319e2f64aff48178d062bf270.tar.gz freebsd-ports-gnome-2a9110fe48a3efd319e2f64aff48178d062bf270.tar.zst freebsd-ports-gnome-2a9110fe48a3efd319e2f64aff48178d062bf270.zip | |
Don't pass the default version in DEPENDS_ARGS.
This greatly simplifies handling for Poudriere.
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/python.mk | 3 | ||||
| -rw-r--r-- | Mk/bsd.ruby.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 4384714c9842..09e924ae82a7 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -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 diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index ba8d2dac6e8c..0c986e8eeb28 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -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}" |