diff options
| author | recht <recht@pkgsrc.org> | 2004-05-23 17:15:09 +0000 |
|---|---|---|
| committer | recht <recht@pkgsrc.org> | 2004-05-23 17:15:09 +0000 |
| commit | 4656bfa63752f45316dc187b0d4c53237fb2c097 (patch) | |
| tree | 7bdb703ce2f00f27140736d0b349c2da09145bb4 /lang/python | |
| parent | a2993cfa0926de864e7c67c7e5cc45bb8f9b7363 (diff) | |
| download | pkgsrc-4656bfa63752f45316dc187b0d4c53237fb2c097.tar.gz | |
Now that all Python modules have been bl3ified remove the bl2 support.
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/pyversion.mk | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index e6ee57a4c05..80de227537f 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.26 2004/04/23 01:25:09 danw Exp $ +# $NetBSD: pyversion.mk,v 1.27 2004/05/23 17:15:09 recht Exp $ .if !defined(PYTHON_PYVERSION_MK) PYTHON_PYVERSION_MK= defined @@ -111,13 +111,7 @@ PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23-pth}:${PYPKGSRCDIR} PYPACKAGE= python23-pth PYVERSSUFFIX= 2p3 PYPKGPREFIX= py23pth -. if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) -PTHREAD_OPTS= require -. include "../../mk/pthread.buildlink2.mk" -. if ${PTHREAD_TYPE} == "pth" -. include "../../devel/pth/buildlink2.mk" -. endif -. elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) +. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) PTHREAD_OPTS= require . include "../../mk/pthread.buildlink3.mk" . if ${PTHREAD_TYPE} == "pth" @@ -136,13 +130,7 @@ PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22-pth}:${PYPKGSRCDIR} PYPACKAGE= python22-pth PYVERSSUFFIX= 2p2 PYPKGPREFIX= py22pth -. if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) -PTHREAD_OPTS= require -. include "../../mk/pthread.buildlink2.mk" -. if ${PTHREAD_TYPE} == "pth" -. include "../../devel/pth/buildlink2.mk" -. endif -. elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) +. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) PTHREAD_OPTS= require . include "../../mk/pthread.buildlink3.mk" . if ${PTHREAD_TYPE} == "pth" @@ -161,13 +149,7 @@ PYPACKAGE= python21-pth PYDEPENDENCY= ${BUILDLINK_DEPENDS.python21-pth}:${PYPKGSRCDIR} PYVERSSUFFIX= 2p1 PYPKGPREFIX= py21pth -. if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) -PTHREAD_OPTS= require -. include "../../mk/pthread.buildlink2.mk" -. if ${PTHREAD_TYPE} == "pth" -. include "../../devel/pth/buildlink2.mk" -. endif -. elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) +. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) PTHREAD_OPTS= require . include "../../mk/pthread.buildlink3.mk" . if ${PTHREAD_TYPE} == "pth" @@ -194,16 +176,11 @@ BUILD_DEPENDS+= py15-distutils-*:../../devel/py-distutils error: no valid Python version .endif -.if (defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])) || \ - (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])) +.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])) . if defined(PYTHON_FOR_BUILD_ONLY) BUILD_DEPMETHOD.python?= build . endif -. if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) -. include "${PYPKGSRCDIR}/buildlink2.mk" -. else -. include "${PYPKGSRCDIR}/buildlink3.mk" -. endif +. include "${PYPKGSRCDIR}/buildlink3.mk" .else . if defined(PYTHON_FOR_BUILD_ONLY) BUILD_DEPENDS+= ${PYDEPENDENCY} |