Tue Sep 22 13:46:09 2009 UTC ()
Use Python 2.6 by default under Mac OS X if we compile for the 64-Bit ABI.
Not even Apple were able to build a 64-Bit version of Python 2.5.


(tron)
diff -r1.74 -r1.75 pkgsrc/lang/python/pyversion.mk
cvs diff -r1.74 -r1.75 pkgsrc/lang/python/pyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/pyversion.mk 2009/09/07 18:21:43 1.74
+++ pkgsrc/lang/python/pyversion.mk 2009/09/22 13:46:09 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pyversion.mk,v 1.74 2009/09/07 18:21:43 joerg Exp $ 1# $NetBSD: pyversion.mk,v 1.75 2009/09/22 13:46:09 tron Exp $
2 2
3# This file determines which Python version is used as a dependency for 3# This file determines which Python version is used as a dependency for
4# a package. 4# a package.
5# 5#
6# === User-settable variables === 6# === User-settable variables ===
7# 7#
8# PYTHON_VERSION_DEFAULT 8# PYTHON_VERSION_DEFAULT
9# The preferred Python version to use. 9# The preferred Python version to use.
10# 10#
11# Possible values: 24 25 26 11# Possible values: 24 25 26
12# Default: 25 12# Default: 25
13# 13#
14# === Package-settable variables === 14# === Package-settable variables ===
@@ -58,27 +58,31 @@ PYTHON_PYVERSION_MK= defined @@ -58,27 +58,31 @@ PYTHON_PYVERSION_MK= defined
58.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \ 58.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \
59 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*) 59 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
60PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 60PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
61.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \ 61.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
62 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*) 62 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
63PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 63PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
64.endif 64.endif
65 65
66.include "../../mk/bsd.prefs.mk" 66.include "../../mk/bsd.prefs.mk"
67 67
68BUILD_DEFS+= PYTHON_VERSION_DEFAULT 68BUILD_DEFS+= PYTHON_VERSION_DEFAULT
69BUILD_DEFS_EFFECTS+= PYPACKAGE 69BUILD_DEFS_EFFECTS+= PYPACKAGE
70 70
 71.if ${OPSYS} != "Darwin" || ${ABI} != "64"
71PYTHON_VERSION_DEFAULT?= 25 72PYTHON_VERSION_DEFAULT?= 25
 73.else
 74PYTHON_VERSION_DEFAULT?= 26
 75.endif
72PYTHON_VERSIONS_ACCEPTED?= 26 25 24 76PYTHON_VERSIONS_ACCEPTED?= 26 25 24
73PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default 77PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
74 78
75BUILDLINK_API_DEPENDS.python24?= python24>=2.4 79BUILDLINK_API_DEPENDS.python24?= python24>=2.4
76BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1 80BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1
77BUILDLINK_API_DEPENDS.python26?= python26>=2.6 81BUILDLINK_API_DEPENDS.python26?= python26>=2.6
78 82
79# transform the list into individual variables 83# transform the list into individual variables
80.for pv in ${PYTHON_VERSIONS_ACCEPTED} 84.for pv in ${PYTHON_VERSIONS_ACCEPTED}
81.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv}) 85.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
82_PYTHON_VERSION_${pv}_OK= yes 86_PYTHON_VERSION_${pv}_OK= yes
83_PYTHON_VERSIONS_ACCEPTED+= ${pv} 87_PYTHON_VERSIONS_ACCEPTED+= ${pv}
84.endif 88.endif