diff --git a/package/base/python/python.conf b/package/base/python/python.conf index 33e41f3e3..e42c9a271 100644 --- a/package/base/python/python.conf +++ b/package/base/python/python.conf @@ -20,32 +20,8 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -# If this is enabled, the resulting python binary will not run without X11 -# and Tcl/Tk. So there is no _tkinter module on default ... -# -enable_tcltk() { - if [ -f /usr/include/tcl.h -a -f /usr/include/tk.h ] ; then - echo "Found tcl.h and tk.h: enabling tcltk support" - { echo "_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \\" ; - echo " -L/usr/X11R6/lib -I/usr/X11R6/include \\" ; - echo " -ltk8.4 -ltcl8.4 -lX11" ; - } >> Modules/Setup.local - export LIBS="$LIBS -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11" - fi -} - -make_py_profile() { - echo "export LIBPYTHON='-lpython2.5$LIBS'" > $root/etc/profile.d/python -} - -export LIBS= -runpysetup=0 -preconf="enable_tcltk" -postmake="make_py_profile" -confopt="$confopt --with-threads --enable-shared" +runpysetup="0" # We can savely ignore this dependencies. var_append flistrfilter "|" ".*: /usr/lib/python.*/site-packages/.*" -versionhotfix 2.5.1 - diff --git a/package/base/python/python.desc b/package/base/python/python.desc index 8fb1a3ffb..6a380304b 100644 --- a/package/base/python/python.desc +++ b/package/base/python/python.desc @@ -36,10 +36,10 @@ [L] OpenSource [S] Stable -[V] 2.5.1 +[V] 2.6.2 [P] X --?--5---9 116.097 -[D] 1342971328 Python-2.5.1.tar.bz2 http://www.python.org/ftp/python/2.5.1/ +[D] 365861345 Python-2.6.2.tar.bz2 http://www.python.org/ftp/python/2.6.2/ [CV-URL] http://www.python.org/download/