python: upgrade from 2.6.5 to 2.6.6

* refresh patches from poky where applicable

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/python/python-2.6.5/00-fix-bindir-libdir-for-cross.patch b/recipes/python/python-2.6.5/00-fix-bindir-libdir-for-cross.patch
deleted file mode 100644 (file)
index 2559e3a..0000000
--- a/recipes/python/python-2.6.5/00-fix-bindir-libdir-for-cross.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# $(exec_prefix) points to the wrong directory, when installing
-# a cross-build. @bindir@ and @libdir@ works better and doesn't
-# affect the native build.
-# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
-
-Index: Python-2.6.1/Makefile.pre.in
-===================================================================
---- Python-2.6.1.orig/Makefile.pre.in
-+++ Python-2.6.1/Makefile.pre.in
-@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@
- datarootdir=    @datarootdir@
- 
- # Expanded directories
--BINDIR=               $(exec_prefix)/bin
--LIBDIR=               $(exec_prefix)/lib
-+BINDIR=               @bindir@
-+LIBDIR=               @libdir@
- MANDIR=               @mandir@
- INCLUDEDIR=   @includedir@
- CONFINCLUDEDIR=       $(exec_prefix)/include

diff --git a/recipes/python/python-2.6.5/99-ignore-optimization-flag.patch b/recipes/python/python-2.6.5/99-ignore-optimization-flag.patch
deleted file mode 100644 (file)
index dcee112..0000000
--- a/recipes/python/python-2.6.5/99-ignore-optimization-flag.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Reinstate the empty -O option to fix weird mixing of native and target
-# binaries and libraries with LD_LIBRARY_PATH when host==target
-#
-# Signed-off-by: Denys Dmytriyenko <denis@denix.org>
-
-diff -uNr Python-2.6.5.orig//Modules/main.c Python-2.6.5/Modules/main.c
---- Python-2.6.5.orig//Modules/main.c  2009-10-27 13:48:52.000000000 +0100
-+++ Python-2.6.5/Modules/main.c        2010-08-16 21:25:04.000000000 +0200
-@@ -328,8 +328,7 @@
- 
-               /* case 'J': reserved for Jython */
- 
--              case 'O':
--                      Py_OptimizeFlag++;
-+              case 'O': /* ignore it */
-                       break;
- 
-               case 'B':

diff --git a/recipes/python/python-2.6.5/00-fix-parallel-make.patch b/recipes/python/python-2.6.6/00-fix-parallel-make.patch
similarity index 100%
rename from recipes/python/python-2.6.5/00-fix-parallel-make.patch
rename to recipes/python/python-2.6.6/00-fix-parallel-make.patch

diff --git a/recipes/python/python-2.6.5/01-use-proper-tools-for-cross-build.patch b/recipes/python/python-2.6.6/01-use-proper-tools-for-cross-build.patch
similarity index 78%
rename from recipes/python/python-2.6.5/01-use-proper-tools-for-cross-build.patch
rename to recipes/python/python-2.6.6/01-use-proper-tools-for-cross-build.patch
index 4b485ec..b7467cc 100644 (file)
--- a/recipes/python/python-2.6.5/01-use-proper-tools-for-cross-build.patch
+++ b/recipes/python/python-2.6.6/01-use-proper-tools-for-cross-build.patch
@@ -2,10 +2,10 @@
 # built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN.
 # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
 
-Index: Python-2.6.1/Makefile.pre.in
+Index: Python-2.6.6/Makefile.pre.in
 ===================================================================
---- Python-2.6.1.orig/Makefile.pre.in
-+++ Python-2.6.1/Makefile.pre.in
+--- Python-2.6.6.orig/Makefile.pre.in
++++ Python-2.6.6/Makefile.pre.in
 @@ -175,6 +175,7 @@ UNICODE_OBJS=   @UNICODE_OBJS@
  
  PYTHON=               python$(EXE)
@@ -14,7 +14,7 @@ Index: Python-2.6.1/Makefile.pre.in
  
  # The task to run while instrument when building the profile-opt target
  PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
-@@ -206,7 +207,7 @@ GRAMMAR_INPUT=     $(srcdir)/Grammar/Grammar
+@@ -205,7 +206,7 @@ GRAMMAR_INPUT=     $(srcdir)/Grammar/Grammar
  ##########################################################################
  # Parser
  PGEN=         Parser/pgen$(EXE)
@@ -23,18 +23,18 @@ Index: Python-2.6.1/Makefile.pre.in
  POBJS=                \
                Parser/acceler.o \
                Parser/grammar1.o \
-@@ -395,8 +396,8 @@ platform: $(BUILDPYTHON)
+@@ -394,8 +395,8 @@ platform: $(BUILDPYTHON)
  # Build the shared modules
  sharedmods: $(BUILDPYTHON)
        @case $$MAKEFLAGS in \
--      *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
--      *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-+      *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
-+      *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
+-      *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+-      *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++      *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
++      *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
        esac
  
  # Build static library
-@@ -531,7 +532,7 @@ $(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP)
+@@ -517,7 +518,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
  
  $(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT)
                -@$(INSTALL) -d Include
@@ -43,7 +43,7 @@ Index: Python-2.6.1/Makefile.pre.in
                touch $(GRAMMAR_STAMP)
  
  $(PGEN):      $(PGENOBJS)
-@@ -902,23 +903,23 @@ libinstall:      build_all $(srcdir)/Lib/$(PL
+@@ -887,23 +888,23 @@ libinstall:      build_all $(srcdir)/Lib/$(PL
        done
        $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
        PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
@@ -72,7 +72,7 @@ Index: Python-2.6.1/Makefile.pre.in
  
  # Create the PLATDIR source directory, if one wasn't distributed..
  $(srcdir)/Lib/$(PLATDIR):
-@@ -1016,7 +1017,7 @@ libainstall:     all
+@@ -1001,7 +1002,7 @@ libainstall:     all
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall:
@@ -81,11 +81,11 @@ Index: Python-2.6.1/Makefile.pre.in
                --prefix=$(prefix) \
                --install-scripts=$(BINDIR) \
                --install-platlib=$(DESTSHARED) \
-Index: Python-2.6.1/setup.py
+Index: Python-2.6.6/setup.py
 ===================================================================
---- Python-2.6.1.orig/setup.py
-+++ Python-2.6.1/setup.py
-@@ -276,6 +276,7 @@ class PyBuildExt(build_ext):
+--- Python-2.6.6.orig/setup.py
++++ Python-2.6.6/setup.py
+@@ -322,6 +322,7 @@ class PyBuildExt(build_ext):
              self.failed.append(ext.name)
              self.announce('*** WARNING: renaming "%s" since importing it'
                            ' failed: %s' % (ext.name, why), level=3)
@@ -93,7 +93,7 @@ Index: Python-2.6.1/setup.py
              assert not self.inplace
              basename, tail = os.path.splitext(ext_filename)
              newname = basename + "_failed" + tail
-@@ -310,8 +311,8 @@ class PyBuildExt(build_ext):
+@@ -356,8 +357,8 @@ class PyBuildExt(build_ext):
  
      def detect_modules(self):
          # Ensure that /usr/local is always used
@@ -104,7 +104,7 @@ Index: Python-2.6.1/setup.py
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -410,6 +411,9 @@ class PyBuildExt(build_ext):
+@@ -456,6 +457,9 @@ class PyBuildExt(build_ext):
  
          # XXX Omitted modules: gl, pure, dl, SGI-specific modules
  

diff --git a/recipes/python/python-2.6.5/02-remove-test-for-cross.patch b/recipes/python/python-2.6.6/02-remove-test-for-cross.patch
similarity index 100%
rename from recipes/python/python-2.6.5/02-remove-test-for-cross.patch
rename to recipes/python/python-2.6.6/02-remove-test-for-cross.patch

diff --git a/recipes/python/python-2.6.5/03-fix-tkinter-detection.patch b/recipes/python/python-2.6.6/03-fix-tkinter-detection.patch
similarity index 100%
rename from recipes/python/python-2.6.5/03-fix-tkinter-detection.patch
rename to recipes/python/python-2.6.6/03-fix-tkinter-detection.patch

diff --git a/recipes/python/python-2.6.5/04-default-is-optimized.patch b/recipes/python/python-2.6.6/04-default-is-optimized.patch
similarity index 68%
rename from recipes/python/python-2.6.5/04-default-is-optimized.patch
rename to recipes/python/python-2.6.6/04-default-is-optimized.patch
index 5131e0b..f99ea4c 100644 (file)
--- a/recipes/python/python-2.6.5/04-default-is-optimized.patch
+++ b/recipes/python/python-2.6.6/04-default-is-optimized.patch
@@ -1,12 +1,13 @@
-# When compiling for an embedded system, we need every bit of
+# when compiling for an embedded system, we need every bit of
 # performance we can get. default to optimized with the option
 # of opt-out.
+# 
 # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
 
-Index: Python-2.6.1/Python/compile.c
+Index: Python-2.6.6/Python/compile.c
 ===================================================================
---- Python-2.6.1.orig/Python/compile.c
-+++ Python-2.6.1/Python/compile.c
+--- Python-2.6.6.orig/Python/compile.c
++++ Python-2.6.6/Python/compile.c
 @@ -32,7 +32,7 @@
  #include "symtable.h"
  #include "opcode.h"

diff --git a/recipes/python/python-2.6.5/05-enable-ctypes-cross-build.patch b/recipes/python/python-2.6.6/05-enable-ctypes-cross-build.patch
similarity index 100%
rename from recipes/python/python-2.6.5/05-enable-ctypes-cross-build.patch
rename to recipes/python/python-2.6.6/05-enable-ctypes-cross-build.patch

diff --git a/recipes/python/python-2.6.5/06-ctypes-libffi-fix-configure.patch b/recipes/python/python-2.6.6/06-ctypes-libffi-fix-configure.patch
similarity index 100%
rename from recipes/python/python-2.6.5/06-ctypes-libffi-fix-configure.patch
rename to recipes/python/python-2.6.6/06-ctypes-libffi-fix-configure.patch

diff --git a/recipes/python/python-2.6.5/10-distutils-fix-swig-parameter.patch b/recipes/python/python-2.6.6/10-distutils-fix-swig-parameter.patch
similarity index 100%
rename from recipes/python/python-2.6.5/10-distutils-fix-swig-parameter.patch
rename to recipes/python/python-2.6.6/10-distutils-fix-swig-parameter.patch

diff --git a/recipes/python/python-2.6.5/11-distutils-never-modify-shebang-line.patch b/recipes/python/python-2.6.6/11-distutils-never-modify-shebang-line.patch
similarity index 100%
rename from recipes/python/python-2.6.5/11-distutils-never-modify-shebang-line.patch
rename to recipes/python/python-2.6.6/11-distutils-never-modify-shebang-line.patch

diff --git a/recipes/python/python-2.6.5/12-distutils-prefix-is-inside-staging-area.patch b/recipes/python/python-2.6.6/12-distutils-prefix-is-inside-staging-area.patch
similarity index 82%
rename from recipes/python/python-2.6.5/12-distutils-prefix-is-inside-staging-area.patch
rename to recipes/python/python-2.6.6/12-distutils-prefix-is-inside-staging-area.patch
index aa43936..bf4366f 100644 (file)
--- a/recipes/python/python-2.6.5/12-distutils-prefix-is-inside-staging-area.patch
+++ b/recipes/python/python-2.6.6/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,10 +1,10 @@
 # The proper prefix is inside our staging area.
 # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
 
-Index: Python-2.6.1/Lib/distutils/sysconfig.py
+Index: Python-2.6.6/Lib/distutils/sysconfig.py
 ===================================================================
---- Python-2.6.1.orig/Lib/distutils/sysconfig.py
-+++ Python-2.6.1/Lib/distutils/sysconfig.py
+--- Python-2.6.6.orig/Lib/distutils/sysconfig.py
++++ Python-2.6.6/Lib/distutils/sysconfig.py
 @@ -19,8 +19,8 @@ import sys
  from distutils.errors import DistutilsPlatformError
  
@@ -25,10 +25,10 @@ Index: Python-2.6.1/Lib/distutils/sysconfig.py
 +            prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include')
 +        else:
 +            prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
      if os.name == "posix":
          if python_build:
-             base = os.path.dirname(os.path.abspath(sys.executable))
-@@ -112,7 +115,10 @@ def get_python_lib(plat_specific=0, stan
+@@ -116,7 +119,10 @@ def get_python_lib(plat_specific=0, stan
      sys.exec_prefix -- i.e., ignore 'plat_specific'.
      """
      if prefix is None:
@@ -40,7 +40,7 @@ Index: Python-2.6.1/Lib/distutils/sysconfig.py
  
      if os.name == "posix":
          libpython = os.path.join(prefix,
-@@ -218,7 +218,7 @@ def get_config_h_filename():
+@@ -216,7 +222,7 @@ def get_config_h_filename():
      else:
          # The name of the config.h file changed in 2.2
          config_h = 'pyconfig.h'
@@ -49,9 +49,9 @@ Index: Python-2.6.1/Lib/distutils/sysconfig.py
  
  
  def get_makefile_filename():
-@@ -226,7 +226,7 @@ def get_makefile_filename():
-     if python_build:
-         return os.path.join(os.path.dirname(sys.executable), "Makefile")
+@@ -225,7 +231,7 @@ def get_makefile_filename():
+         return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
+                             "Makefile")
      lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
 -    return os.path.join(lib_dir, "config", "Makefile")
 +    return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )

diff --git a/recipes/python/python-2.6.5/debug.patch b/recipes/python/python-2.6.6/debug.patch
similarity index 100%
rename from recipes/python/python-2.6.5/debug.patch
rename to recipes/python/python-2.6.6/debug.patch

diff --git a/recipes/python/python-2.6.5/ipv6-cross.patch b/recipes/python/python-2.6.6/ipv6-cross.patch
similarity index 100%
rename from recipes/python/python-2.6.5/ipv6-cross.patch
rename to recipes/python/python-2.6.6/ipv6-cross.patch

diff --git a/recipes/python/python-2.6.5/nohostlibs.patch b/recipes/python/python-2.6.6/nohostlibs.patch
similarity index 74%
rename from recipes/python/python-2.6.5/nohostlibs.patch
rename to recipes/python/python-2.6.6/nohostlibs.patch
index 7020f3c..cc9b28c 100644 (file)
--- a/recipes/python/python-2.6.5/nohostlibs.patch
+++ b/recipes/python/python-2.6.6/nohostlibs.patch
@@ -1,8 +1,8 @@
-Index: Python-2.6.1/setup.py
+Index: Python-2.6.6/setup.py
 ===================================================================
---- Python-2.6.1.orig/setup.py 2009-11-13 16:20:47.000000000 +0000
-+++ Python-2.6.1/setup.py      2009-11-13 16:28:00.000000000 +0000
-@@ -310,8 +310,8 @@
+--- Python-2.6.6.orig/setup.py
++++ Python-2.6.6/setup.py
+@@ -356,8 +356,8 @@ class PyBuildExt(build_ext):
  
      def detect_modules(self):
          # Ensure that /usr/local is always used
@@ -13,7 +13,7 @@ Index: Python-2.6.1/setup.py
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -347,10 +347,10 @@
+@@ -393,10 +393,10 @@ class PyBuildExt(build_ext):
                      for directory in reversed(options.dirs):
                          add_dir_to_list(dir_list, directory)
  
@@ -27,7 +27,7 @@ Index: Python-2.6.1/setup.py
                              sysconfig.get_config_var("INCLUDEDIR"))
  
          try:
-@@ -361,11 +361,8 @@
+@@ -407,11 +407,8 @@ class PyBuildExt(build_ext):
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
@@ -41,13 +41,17 @@ Index: Python-2.6.1/setup.py
          exts = []
          missing = []
  
-@@ -583,8 +580,7 @@
-                 readline_libs.append('ncurses')
-             elif self.compiler.find_library_file(lib_dirs, 'curses'):
-                 readline_libs.append('curses')
+@@ -661,8 +658,7 @@ class PyBuildExt(build_ext):
+                 pass # Issue 7384: Already linked against curses or tinfo.
+             elif curses_library:
+                 readline_libs.append(curses_library)
 -            elif self.compiler.find_library_file(lib_dirs +
 -                                               ['/usr/lib/termcap'],
 +            elif self.compiler.find_library_file(lib_dirs,
                                                 'termcap'):
                  readline_libs.append('termcap')
              exts.append( Extension('readline', ['readline.c'],
+-                                   library_dirs=['/usr/lib/termcap'],
+                                    extra_link_args=readline_extra_link_args,
+                                    libraries=readline_libs) )
+         else:

diff --git a/recipes/python/python-2.6.5/sitecustomize.py b/recipes/python/python-2.6.6/sitecustomize.py
similarity index 100%
rename from recipes/python/python-2.6.5/sitecustomize.py
rename to recipes/python/python-2.6.6/sitecustomize.py

diff --git a/recipes/python/python-native_2.6.5.bb b/recipes/python/python-native_2.6.6.bb
similarity index 85%
rename from recipes/python/python-native_2.6.5.bb
rename to recipes/python/python-native_2.6.6.bb
index 0fd6dcb..2eef01d 100644 (file)
--- a/recipes/python/python-native_2.6.5.bb
+++ b/recipes/python/python-native_2.6.6.bb
@@ -1,11 +1,10 @@
 require python.inc
 DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
 
 FILESPATHPKG .= ":python-${PV}:python"
 SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
            file://00-fix-parallel-make.patch \
-           file://00-fix-bindir-libdir-for-cross.patch \
            file://04-default-is-optimized.patch \
            file://05-enable-ctypes-cross-build.patch \
            file://06-ctypes-libffi-fix-configure.patch \
@@ -14,8 +13,8 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
            file://12-distutils-prefix-is-inside-staging-area.patch \
            file://debug.patch \
            file://nohostlibs.patch"
-SRC_URI[md5sum] = "6bef0417e71a1a1737ccf5750420fdb3"
-SRC_URI[sha256sum] = "62da62eb685621ede2be1275f11b89fa0e0be578db8daa5320d0a7855c0a9ebc"
+SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14"
+SRC_URI[sha256sum] = "134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83"
 
 S = "${WORKDIR}/Python-${PV}"
 

diff --git a/recipes/python/python_2.6.5.bb b/recipes/python/python_2.6.6.bb
similarity index 94%
rename from recipes/python/python_2.6.5.bb
rename to recipes/python/python_2.6.6.bb
index d7d42a7..4152554 100644 (file)
--- a/recipes/python/python_2.6.5.bb
+++ b/recipes/python/python_2.6.6.bb
@@ -3,24 +3,22 @@ DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl zlib\
            ${@base_contains('DISTRO_FEATURES', 'tk', 'tk', '', d)}"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 # set to .0 on every increase of INC_PR
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.0"
 
 SRC_URI = "\
   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
   file://00-fix-parallel-make.patch \
-  file://00-fix-bindir-libdir-for-cross.patch \
   file://01-use-proper-tools-for-cross-build.patch \
   file://02-remove-test-for-cross.patch \
   file://03-fix-tkinter-detection.patch \
   file://04-default-is-optimized.patch \
   file://05-enable-ctypes-cross-build.patch \
   file://06-ctypes-libffi-fix-configure.patch \
-  file://99-ignore-optimization-flag.patch \
   file://ipv6-cross.patch \
   file://sitecustomize.py \
 "
-SRC_URI[md5sum] = "6bef0417e71a1a1737ccf5750420fdb3"
-SRC_URI[sha256sum] = "62da62eb685621ede2be1275f11b89fa0e0be578db8daa5320d0a7855c0a9ebc"
+SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14"
+SRC_URI[sha256sum] = "134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83"
 
 S = "${WORKDIR}/Python-${PV}"