python: Update to 2.7.

diff --git a/pkgs/core/python/patches/python-2.6.2-binutils-no-dep.patch b/pkgs/core/python/patches/python-2.6.2-binutils-no-dep.patch
deleted file mode 100644 (file)
index 57cd07c..0000000
--- a/pkgs/core/python/patches/python-2.6.2-binutils-no-dep.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru Python-2.6.2-orig/Lib/ctypes/util.py Python-2.6.2/Lib/ctypes/util.py
---- Python-2.6.2-orig/Lib/ctypes/util.py       2009-01-10 12:11:11.000000000 -0500
-+++ Python-2.6.2/Lib/ctypes/util.py    2009-07-30 15:17:39.000000000 -0400
-@@ -133,7 +133,9 @@
-             dump = f.read()
-             rv = f.close()
-             if rv == 10:
--                raise OSError, 'objdump command not found'
-+                return os.path.basename(f) #  This is good for GLibc, I think,
-+                                           # and a dep on binutils is big (for
-+                                           # live CDs).
-             res = re.search(r'\sSONAME\s+([^\s]+)', os.popen(cmd).read())
-             if not res:
-                 return None
-Only in Python-2.6.2/Lib/ctypes: util.py~

diff --git a/pkgs/core/python/patches/python-2.6.2-with-system-expat.patch b/pkgs/core/python/patches/python-2.6.2-with-system-expat.patch
deleted file mode 100644 (file)
index 2510aef..0000000
--- a/pkgs/core/python/patches/python-2.6.2-with-system-expat.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -up Python-2.6.2/configure.in.expat Python-2.6.2/configure.in
---- Python-2.6.2/configure.in.expat    2010-01-25 21:46:42.700858981 -0500
-+++ Python-2.6.2/configure.in  2010-01-25 21:46:54.710857387 -0500
-@@ -1898,6 +1898,13 @@ LIBS="$withval $LIBS"
- ],
- [AC_MSG_RESULT(no)])
- 
-+# Check for use of the system expat library
-+AC_MSG_CHECKING(for --with-system-expat)
-+AC_ARG_WITH(system_expat,
-+            AC_HELP_STRING(--with-system-expat, build pyexpat module using an installed expat library))
-+
-+AC_MSG_RESULT($with_system_expat)
-+
- # Check for use of the system libffi library
- AC_MSG_CHECKING(for --with-system-ffi)
- AC_ARG_WITH(system_ffi,
-diff -up Python-2.6.2/setup.py.expat Python-2.6.2/setup.py
---- Python-2.6.2/setup.py.expat        2010-01-25 21:46:48.490911125 -0500
-+++ Python-2.6.2/setup.py      2010-01-25 21:46:54.711857933 -0500
-@@ -1196,19 +1196,26 @@ class PyBuildExt(build_ext):
-         #
-         # More information on Expat can be found at www.libexpat.org.
-         #
--        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
--        define_macros = [
--            ('HAVE_EXPAT_CONFIG_H', '1'),
--        ]
-+        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-+            expat_inc = []
-+            define_macros = []
-+            expat_lib = ['expat']
-+            expat_sources = []
-+        else:
-+            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
-+            define_macros = [
-+                ('HAVE_EXPAT_CONFIG_H', '1'),
-+            ]
-+            expat_lib = []
-+            expat_sources = ['expat/xmlparse.c',
-+                             'expat/xmlrole.c',
-+                             'expat/xmltok.c']
- 
-         exts.append(Extension('pyexpat',
-                               define_macros = define_macros,
--                              include_dirs = [expatinc],
--                              sources = ['pyexpat.c',
--                                         'expat/xmlparse.c',
--                                         'expat/xmlrole.c',
--                                         'expat/xmltok.c',
--                                         ],
-+                              include_dirs = expat_inc,
-+                              libraries = expat_lib,
-+                              sources = ['pyexpat.c'] + expat_sources
-                               ))
- 
-         # Fredrik Lundh's cElementTree module.  Note that this also
-@@ -1218,7 +1225,8 @@ class PyBuildExt(build_ext):
-             define_macros.append(('USE_PYEXPAT_CAPI', None))
-             exts.append(Extension('_elementtree',
-                                   define_macros = define_macros,
--                                  include_dirs = [expatinc],
-+                                  include_dirs = expat_inc,
-+                                  libraries = expat_lib,
-                                   sources = ['_elementtree.c'],
-                                   ))
-         else:

diff --git a/pkgs/core/python/patches/python-2.6.4-no-static-lib.patch b/pkgs/core/python/patches/python-2.6.4-no-static-lib.patch
deleted file mode 100644 (file)
index 57caafc..0000000
--- a/pkgs/core/python/patches/python-2.6.4-no-static-lib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -up Python-2.6.4/Makefile.pre.in.no-static-lib Python-2.6.4/Makefile.pre.in
---- Python-2.6.4/Makefile.pre.in.no-static-lib 2010-01-18 13:11:10.975859689 -0500
-+++ Python-2.6.4/Makefile.pre.in       2010-01-18 13:14:27.524859334 -0500
-@@ -382,7 +382,7 @@ coverage:
- 
- 
- # Build the interpreter
--$(BUILDPYTHON):       Modules/python.o $(LIBRARY) $(LDLIBRARY)
-+$(BUILDPYTHON):       Modules/python.o $(LDLIBRARY)
-               $(LINKCC) $(CFLAGS) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
-                       Modules/python.o \
-                       $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-@@ -398,18 +398,6 @@ sharedmods: $(BUILDPYTHON)
-       *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-       esac
- 
--# Build static library
--# avoid long command lines, same as LIBRARY_OBJS
--$(LIBRARY): $(LIBRARY_OBJS)
--      -rm -f $@
--      $(AR) cr $@ Modules/getbuildinfo.o
--      $(AR) cr $@ $(PARSER_OBJS)
--      $(AR) cr $@ $(OBJECT_OBJS)
--      $(AR) cr $@ $(PYTHON_OBJS)
--      $(AR) cr $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
--      $(AR) cr $@ $(MODOBJS)
--      $(RANLIB) $@
--
- libpython$(VERSION).so: $(LIBRARY_OBJS)
-       if test $(INSTSONAME) != $(LDLIBRARY); then \
-               $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -945,18 +933,6 @@ libainstall:      all
-               else    true; \
-               fi; \
-       done
--      @if test -d $(LIBRARY); then :; else \
--              if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
--                      if test "$(SO)" = .dll; then \
--                              $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
--                      else \
--                              $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--                              $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--                      fi; \
--              else \
--                      echo Skip install of $(LIBRARY) - use make frameworkinstall; \
--              fi; \
--      fi
-       $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
-       $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
-       $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in

diff --git a/pkgs/core/python/python.nm b/pkgs/core/python/python.nm
index 088dad528c908d7d741745fa6c9a614dec3966ed..b0e7739e809438d0527ff04d6388a4f628250c68 100644 (file)
--- a/pkgs/core/python/python.nm
+++ b/pkgs/core/python/python.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = Python
-PKG_VER        = 2.6.5
+PKG_VER        = 2.7
 PKG_REL        = 0
 
 PKG_MAINTAINER =
@@ -45,7 +45,7 @@ define PKG_DESCRIPTION
        libraries, as well as to various windowing systems.
 endef
 
-PKG_TARBALL    = $(THISAPP).tar.bz2
+PKG_TARBALL    = $(THISAPP).tgz
 
 export CFLAGS  += -D_GNU_SOURCE -fwrapv
 export CPPFLAGS = $(shell pkg-config --cflags-only-I libffi)