From: Erwin Rol <[email protected]>
Signed-off-by: Erwin Rol <[email protected]>
---
rules/host-python.make | 4 +---
rules/python.in | 12 ------------
rules/python.make | 11 +----------
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/rules/host-python.make b/rules/host-python.make
index 0dbb01e..f63f5e7 100644
--- a/rules/host-python.make
+++ b/rules/host-python.make
@@ -31,12 +31,10 @@ HOST_PYTHON_ENV := $(HOST_ENV)
HOST_PYTHON_AUTOCONF := \
$(HOST_AUTOCONF) \
--enable-shared \
- --with-cyclic-gc \
--with-pymalloc \
--with-signal-module \
--with-threads \
- --with-wctype-functions \
- --without-cxx
+ --with-wctype-functions
# ----------------------------------------------------------------------------
# Install
diff --git a/rules/python.in b/rules/python.in
index 28c1c15..c20d3d6 100644
--- a/rules/python.in
+++ b/rules/python.in
@@ -24,18 +24,6 @@ menuconfig PYTHON
if PYTHON
-choice
- prompt "python version"
-
- config PYTHON_26
- bool "2.6.x"
-
- config PYTHON_3
- bool "3.x"
- depends on BROKEN
-
-endchoice
-
config PYTHON_NCURSES
bool "ncurses bindings"
diff --git a/rules/python.make b/rules/python.make
index 8b9ee00..f32d738 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -16,15 +16,8 @@ PACKAGES-$(PTXCONF_PYTHON) += python
#
# Paths and names
#
-ifdef PTXCONF_PYTHON_26
PYTHON_VERSION := 2.6.4
PYTHON_MAJORMINOR := 2.6
-endif
-ifdef PTXCONF_PYTHON_3
-PYTHON_VERSION := 3.1a2
-PYTHON_MAJORMINOR := 3.1
-endif
-
PYTHON := Python-$(PYTHON_VERSION)
PYTHON_SUFFIX := tar.bz2
PYTHON_SOURCE := $(SRCDIR)/$(PYTHON).$(PYTHON_SUFFIX)
@@ -62,12 +55,10 @@ PYTHON_BINCONFIG_GLOB := ""
PYTHON_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--enable-shared \
- --with-cyclic-gc \
--with-pymalloc \
--with-signal-module \
--with-threads \
- --with-wctype-functions \
- --without-cxx
+ --with-wctype-functions
PYTHON_MAKEVARS := \
PGEN_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/pgen
--
1.7.0
--
ptxdist mailing list
[email protected]
