summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-03-24 22:42:58 +0000
committerjlam <jlam@pkgsrc.org>2005-03-24 22:42:58 +0000
commitda2fc8539087dd463808a7a952672f18f079609b (patch)
treed7fe497052393fc66a0643bdff66b2bf686bec43 /lang
parentea7c441daab79a9455ebd38814bdc0c1ff418fae (diff)
downloadpkgsrc-da2fc8539087dd463808a7a952672f18f079609b.tar.gz
Don't check for USE_BUILDLINK3 anymore in these files. These are included
by other package Makefiles, and with the deprecation of USE_BUILDLINK3 support in the infrastructure files, these had the potential to break existing packages.
Diffstat (limited to 'lang')
-rw-r--r--lang/python/pyversion.mk22
1 files changed, 7 insertions, 15 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index e365c7faca2..2184b3674f5 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.32 2005/01/24 08:04:41 recht Exp $
+# $NetBSD: pyversion.mk,v 1.33 2005/03/24 22:42:58 jlam Exp $
.if !defined(PYTHON_PYVERSION_MK)
PYTHON_PYVERSION_MK= defined
@@ -137,23 +137,15 @@ BUILD_DEPENDS+= py15-distutils-*:../../devel/py-distutils
error: no valid Python version
.endif
-.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
PTHREAD_OPTS= require
-. include "../../mk/pthread.buildlink3.mk"
-. if ${PTHREAD_TYPE} == "pth"
-. include "../../devel/pth/buildlink3.mk"
-. endif
-. if defined(PYTHON_FOR_BUILD_ONLY)
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "pth"
+. include "../../devel/pth/buildlink3.mk"
+.endif
+.if defined(PYTHON_FOR_BUILD_ONLY)
BUILD_DEPMETHOD.python?= build
-. endif
-. include "${PYPKGSRCDIR}/buildlink3.mk"
-.else
-. if defined(PYTHON_FOR_BUILD_ONLY)
-BUILD_DEPENDS+= ${PYDEPENDENCY}
-. else
-DEPENDS+= ${PYDEPENDENCY}
-. endif
.endif
+.include "${PYPKGSRCDIR}/buildlink3.mk"
PYTHONBIN= ${LOCALBASE}/bin/python${PYVERSSUFFIX}