diff options
| author | riastradh <riastradh> | 2013-05-10 20:07:33 +0000 |
|---|---|---|
| committer | riastradh <riastradh> | 2013-05-10 20:07:33 +0000 |
| commit | 8dd4bedc89055ba6a8396e282e123370828d825e (patch) | |
| tree | 474f9c84ab858a4e92810c428579364927e4e239 /lang | |
| parent | ea2865d744588737588946c1573dcaab2231a98e (diff) | |
| download | pkgsrc-8dd4bedc89055ba6a8396e282e123370828d825e.tar.gz | |
Partially back out change to PYTHON_FOR_BUILD_ONLY.
This broke packages that needed a target Python at build-time.
Instead, change it from defined/undefined to yes/no/tool. Most cases
of defined used `yes' anyway; fix the few stragglers do that instead.
New case `tool' is for TOOL_DEPENDS rather than buildlink3.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/pfe/Makefile | 4 | ||||
| -rw-r--r-- | lang/python/pyversion.mk | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile index 031bf9a6d47..ca0fc1678c5 100644 --- a/lang/pfe/Makefile +++ b/lang/pfe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/03 21:56:20 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2013/05/10 20:07:33 riastradh Exp $ DISTNAME= pfe-0.33.71 PKGREVISION= 4 @@ -21,7 +21,7 @@ INSTALL_TARGET= install install-mans install-docs TEST_TARGET= tests BUILD_DEPENDS= xmlto-[0-9]*:../../textproc/xmlto # documentation -PYTHON_FOR_BUILD_ONLY= # defined +PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/pyversion.mk" .include "../../mk/termcap.buildlink3.mk" diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 82768624c87..6d2dcec13f5 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.107 2013/05/10 00:35:51 riastradh Exp $ +# $NetBSD: pyversion.mk,v 1.108 2013/05/10 20:07:34 riastradh Exp $ # This file determines which Python version is used as a dependency for # a package. @@ -47,8 +47,8 @@ # PYTHON_FOR_BUILD_ONLY # Whether Python is needed only at build time or at run time. # -# Possible values: (defined) (undefined) -# Default: (undefined) +# Possible values: yes no tool +# Default: no # # PYTHON_SELF_CONFLICT # If set to "yes", additional CONFLICTS entries are added for @@ -196,10 +196,12 @@ PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" .if defined(PYPKGSRCDIR) -# XXX BUILD_DEPENDS/TOOL_DEPENDS split makes this variable name confusing. -. if defined(PYTHON_FOR_BUILD_ONLY) -TOOL_DEPENDS+= ${PYDEPENDENCY} +. if !empty(PYTHON_FOR_BUILD_ONLY:M[tT][oO][oO][lL]) +TOOL_DEPENDS+= ${PYDEPENDENCY} . else +. if !empty(PYTHON_FOR_BUILD_ONLY:M[yY][eE][sS]) +BUILDLINK_DEPMETHOD.python?= build +. endif . include "${PYPKGSRCDIR}/buildlink3.mk" . endif .endif |