mirror of
https://git.yoctoproject.org/poky
synced 2026-02-06 16:56:37 +01:00
python: upgrade from 2.7.2 to 2.7.3
bin/python2 link is provided by the python install process, so no need to create it. rebase these patches to the newer code: fix_for_using_different_libdir.patch 04-default-is-optimized.patch remove this patch as it is upstream now: sys_platform_is_now_always_linux2.patch Change default python version to 2.7.3 in the distro config (From OE-Core rev: 5d92a95ea9b480235b7c9ca5949a681376eba725) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble
committed by
Richard Purdie
Richard Purdie
parent
4f4ab8bfe3
commit
7b08f6a9a1
@@ -1,14 +1,20 @@
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Updated original patch for python 2.7.3
|
||||
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
2012/05/01
|
||||
|
||||
|
||||
# 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.6/Python/compile.c
|
||||
Index: Python-2.7.3/Python/compile.c
|
||||
===================================================================
|
||||
--- Python-2.6.6.orig/Python/compile.c
|
||||
+++ Python-2.6.6/Python/compile.c
|
||||
--- Python-2.7.3.orig/Python/compile.c
|
||||
+++ Python-2.7.3/Python/compile.c
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "symtable.h"
|
||||
#include "opcode.h"
|
||||
@@ -18,16 +24,16 @@ Index: Python-2.6.6/Python/compile.c
|
||||
|
||||
#define DEFAULT_BLOCK_SIZE 16
|
||||
#define DEFAULT_BLOCKS 8
|
||||
Index: Python-2.6.6/Modules/main.c
|
||||
Index: Python-2.7.3/Modules/main.c
|
||||
===================================================================
|
||||
--- Python-2.6.6.orig/Modules/main.c
|
||||
+++ Python-2.6.6/Modules/main.c
|
||||
--- Python-2.7.3.orig/Modules/main.c
|
||||
+++ Python-2.7.3/Modules/main.c
|
||||
@@ -40,7 +40,7 @@ static char **orig_argv;
|
||||
static int orig_argc;
|
||||
|
||||
/* command line options */
|
||||
-#define BASE_OPTS "3bBc:dEhiJm:OQ:sStuUvVW:xX?"
|
||||
+#define BASE_OPTS "3bBc:dEhiJm:NOQ:sStuUvVW:xX?"
|
||||
-#define BASE_OPTS "3bBc:dEhiJm:OQ:RsStuUvVW:xX?"
|
||||
+#define BASE_OPTS "3bBc:dEhiJm:NOQ:RsStuUvVW:xX?"
|
||||
|
||||
#ifndef RISCOS
|
||||
#define PROGRAM_OPTS BASE_OPTS
|
||||
@@ -38,10 +44,10 @@ Index: Python-2.6.6/Modules/main.c
|
||||
--O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\
|
||||
--OO : remove doc-strings in addition to the -O optimizations\n\
|
||||
+-N : do NOT optimize generated bytecode\n\
|
||||
-Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
|
||||
-s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\
|
||||
-S : don't imply 'import site' on initialization\n\
|
||||
@@ -328,8 +327,8 @@ Py_Main(int argc, char **argv)
|
||||
-R : use a pseudo-random salt to make hash() values of various types be\n\
|
||||
unpredictable between separate invocations of the interpreter, as\n\
|
||||
a defense against denial-of-service attacks\n\
|
||||
@@ -365,8 +364,8 @@ Py_Main(int argc, char **argv)
|
||||
|
||||
/* case 'J': reserved for Jython */
|
||||
|
||||
|
||||
@@ -7,10 +7,14 @@ in the install process of the host python.
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
Date: 2012/03/14
|
||||
|
||||
Index: Python-2.7.2/Lib/sysconfig.py
|
||||
Updated for python 2.7.3
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
Date: 2012/05/01
|
||||
|
||||
Index: Python-2.7.3/Lib/sysconfig.py
|
||||
===================================================================
|
||||
--- Python-2.7.2.orig/Lib/sysconfig.py
|
||||
+++ Python-2.7.2/Lib/sysconfig.py
|
||||
--- Python-2.7.3.orig/Lib/sysconfig.py
|
||||
+++ Python-2.7.3/Lib/sysconfig.py
|
||||
@@ -7,10 +7,10 @@ from os.path import pardir, realpath
|
||||
|
||||
_INSTALL_SCHEMES = {
|
||||
@@ -41,14 +45,14 @@ Index: Python-2.7.2/Lib/sysconfig.py
|
||||
'include': '{userbase}/include/python{py_version_short}',
|
||||
'scripts': '{userbase}/bin',
|
||||
'data' : '{userbase}',
|
||||
Index: Python-2.7.2/Makefile.pre.in
|
||||
Index: Python-2.7.3/Makefile.pre.in
|
||||
===================================================================
|
||||
--- Python-2.7.2.orig/Makefile.pre.in
|
||||
+++ Python-2.7.2/Makefile.pre.in
|
||||
@@ -928,25 +928,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL
|
||||
done; \
|
||||
done
|
||||
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
|
||||
--- Python-2.7.3.orig/Makefile.pre.in
|
||||
+++ Python-2.7.3/Makefile.pre.in
|
||||
@@ -941,25 +941,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL
|
||||
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
|
||||
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
|
||||
fi
|
||||
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
||||
$(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
@@ -56,7 +60,7 @@ Index: Python-2.7.2/Makefile.pre.in
|
||||
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
|
||||
$(DESTDIR)$(LIBDEST)
|
||||
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
||||
+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
||||
$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
-d $(LIBDEST) -f \
|
||||
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
|
||||
@@ -67,12 +71,12 @@ Index: Python-2.7.2/Makefile.pre.in
|
||||
-d $(LIBDEST)/site-packages -f \
|
||||
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
||||
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
||||
$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
-d $(LIBDEST)/site-packages -f \
|
||||
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
||||
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
|
||||
$(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
|
||||
|
||||
# Create the PLATDIR source directory, if one wasn't distributed..
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
Upstream-Status: Accepted [http://hg.python.org/cpython/rev/c816479f6aaf/]
|
||||
Bugtracker: http://bugs.python.org/issue12326
|
||||
|
||||
[Removed "Misc/NEWS" hunk]
|
||||
|
||||
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
|
||||
|
||||
# HG changeset patch
|
||||
# User Victor Stinner <victor.stinner@haypocalc.com>
|
||||
# Date 1313841758 -7200
|
||||
# Node ID c816479f6aaf71dbd3f3fe4b239186d60c55ce48
|
||||
# Parent 3e093590ac57fdda428c7da3f72ddf0c475ecf2b
|
||||
Issue #12326: sys.platform is now always 'linux2' on Linux
|
||||
|
||||
Even if Python is compiled on Linux 3.
|
||||
|
||||
diff --git a/configure b/configure
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2995,6 +2995,7 @@ then
|
||||
MACHDEP="$ac_md_system$ac_md_release"
|
||||
|
||||
case $MACHDEP in
|
||||
+ linux*) MACHDEP="linux2";;
|
||||
cygwin*) MACHDEP="cygwin";;
|
||||
darwin*) MACHDEP="darwin";;
|
||||
atheos*) MACHDEP="atheos";;
|
||||
diff --git a/configure.in b/configure.in
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -293,6 +293,7 @@ then
|
||||
MACHDEP="$ac_md_system$ac_md_release"
|
||||
|
||||
case $MACHDEP in
|
||||
+ linux*) MACHDEP="linux2";;
|
||||
cygwin*) MACHDEP="cygwin";;
|
||||
darwin*) MACHDEP="darwin";;
|
||||
atheos*) MACHDEP="atheos";;
|
||||
|
||||
Reference in New Issue
Block a user