diff --git a/packages/lang/Python-host/build b/packages/lang/Python-host/build index 0175f12f07..a008832850 100755 --- a/packages/lang/Python-host/build +++ b/packages/lang/Python-host/build @@ -54,9 +54,6 @@ make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \ cp Parser/pgen $ROOT/$TOOLCHAIN/bin -# symlink python binary to python2 (needed for Mesa) - ln -sf python $ROOT/$TOOLCHAIN/bin/python2 - # replace python-config to make sure python uses $SYSROOT_PREFIX mkdir -p $ROOT/$TOOLCHAIN/bin rm -rf $ROOT/$TOOLCHAIN/bin/python*-config diff --git a/packages/lang/Python/meta b/packages/lang/Python/meta index eca71315f9..0a10562956 100644 --- a/packages/lang/Python/meta +++ b/packages/lang/Python/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="Python" -PKG_VERSION="2.7.2" +PKG_VERSION="2.7.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/lang/Python/patches/Python-2.7.2-016-python_symlink-0.1.patch b/packages/lang/Python/patches/Python-2.7.2-016-python_symlink-0.1.patch deleted file mode 100644 index f284dba555..0000000000 --- a/packages/lang/Python/patches/Python-2.7.2-016-python_symlink-0.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -Use a symlink between python and pythonVERSION - -By default, a hard link is used between /usr/bin/python and -/usr/bin/pythonVERSION. Using hard links for such things is fairly -uncommon, so let's make a symbolic link instead. - -Signed-off-by: Thomas Petazzoni - ---- - Makefile.pre.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: Python-2.7.1/Makefile.pre.in -=================================================================== ---- Python-2.7.1.orig/Makefile.pre.in -+++ Python-2.7.1/Makefile.pre.in -@@ -791,7 +791,7 @@ - then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ - else true; \ - fi -- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)) -+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON)) - -rm -f $(DESTDIR)$(BINDIR)/python-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) - -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) diff --git a/packages/lang/Python/patches/Python-2.7.2-001_xcompile.patch b/packages/lang/Python/patches/Python-2.7.3-001_xcompile.patch similarity index 85% rename from packages/lang/Python/patches/Python-2.7.2-001_xcompile.patch rename to packages/lang/Python/patches/Python-2.7.3-001_xcompile.patch index b8acda082a..b443eeac5c 100644 --- a/packages/lang/Python/patches/Python-2.7.2-001_xcompile.patch +++ b/packages/lang/Python/patches/Python-2.7.3-001_xcompile.patch @@ -1,7 +1,7 @@ -diff -Naur Python-2.7.2/configure Python-2.7.2.patch/configure ---- Python-2.7.2/configure 2011-06-11 17:46:28.000000000 +0200 -+++ Python-2.7.2.patch/configure 2011-10-25 13:10:19.311789641 +0200 -@@ -13673,7 +13673,7 @@ +diff -Naur Python-2.7.3/configure Python-2.7.3.patch/configure +--- Python-2.7.3/configure 2012-04-10 01:07:36.000000000 +0200 ++++ Python-2.7.3.patch/configure 2012-04-16 14:27:58.161470960 +0200 +@@ -13697,7 +13697,7 @@ $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10,7 +10,7 @@ diff -Naur Python-2.7.2/configure Python-2.7.2.patch/configure else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -13725,7 +13725,7 @@ +@@ -13749,7 +13749,7 @@ $as_echo "$ac_cv_have_long_long_format" >&6; } fi @@ -19,9 +19,9 @@ diff -Naur Python-2.7.2/configure Python-2.7.2.patch/configure then $as_echo "#define PY_FORMAT_LONG_LONG \"ll\"" >>confdefs.h -diff -Naur Python-2.7.2/Makefile.pre.in Python-2.7.2.patch/Makefile.pre.in ---- Python-2.7.2/Makefile.pre.in 2011-06-11 17:46:26.000000000 +0200 -+++ Python-2.7.2.patch/Makefile.pre.in 2011-10-25 13:11:38.879809670 +0200 +diff -Naur Python-2.7.3/Makefile.pre.in Python-2.7.3.patch/Makefile.pre.in +--- Python-2.7.3/Makefile.pre.in 2012-04-10 01:07:33.000000000 +0200 ++++ Python-2.7.3.patch/Makefile.pre.in 2012-04-16 14:30:27.753099115 +0200 @@ -182,6 +182,7 @@ PYTHON= python$(EXE) @@ -39,7 +39,7 @@ diff -Naur Python-2.7.2/Makefile.pre.in Python-2.7.2.patch/Makefile.pre.in POBJS= \ Parser/acceler.o \ Parser/grammar1.o \ -@@ -407,8 +410,8 @@ +@@ -408,8 +411,8 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) @case $$MAKEFLAGS in \ @@ -50,7 +50,7 @@ diff -Naur Python-2.7.2/Makefile.pre.in Python-2.7.2.patch/Makefile.pre.in esac # Build static library -@@ -542,7 +545,7 @@ +@@ -543,7 +546,7 @@ $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT) -@$(INSTALL) -d Include @@ -59,10 +59,10 @@ diff -Naur Python-2.7.2/Makefile.pre.in Python-2.7.2.patch/Makefile.pre.in -touch Parser/pgen.stamp $(PGEN): $(PGENOBJS) -@@ -925,26 +928,26 @@ - done; \ - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt +@@ -938,26 +941,26 @@ + $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ + $(DESTDIR)$(LIBDEST)/distutils/tests ; \ + fi - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ @@ -93,7 +93,7 @@ diff -Naur Python-2.7.2/Makefile.pre.in Python-2.7.2.patch/Makefile.pre.in # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): -@@ -1049,7 +1052,9 @@ +@@ -1062,7 +1065,9 @@ # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -104,9 +104,9 @@ diff -Naur Python-2.7.2/Makefile.pre.in Python-2.7.2.patch/Makefile.pre.in --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ -diff -Naur Python-2.7.2/setup.py Python-2.7.2.patch/setup.py ---- Python-2.7.2/setup.py 2011-06-11 17:46:28.000000000 +0200 -+++ Python-2.7.2.patch/setup.py 2011-10-25 13:10:19.300789501 +0200 +diff -Naur Python-2.7.3/setup.py Python-2.7.3.patch/setup.py +--- Python-2.7.3/setup.py 2012-04-10 01:07:36.000000000 +0200 ++++ Python-2.7.3.patch/setup.py 2012-04-16 14:27:58.164471010 +0200 @@ -23,6 +23,10 @@ # This global variable is used to hold the list of modules to be disabled. disabled_module_list = [] diff --git a/packages/lang/Python/patches/Python-2.7.2-002_xcompile_path-0.1.patch b/packages/lang/Python/patches/Python-2.7.3-002_xcompile_path-0.1.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.2-002_xcompile_path-0.1.patch rename to packages/lang/Python/patches/Python-2.7.3-002_xcompile_path-0.1.patch diff --git a/packages/lang/Python/patches/Python-2.7.2-003_xcompile_disable_modules_and_ssl-0.1.patch b/packages/lang/Python/patches/Python-2.7.3-003_xcompile_disable_modules_and_ssl-0.1.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.2-003_xcompile_disable_modules_and_ssl-0.1.patch rename to packages/lang/Python/patches/Python-2.7.3-003_xcompile_disable_modules_and_ssl-0.1.patch diff --git a/packages/lang/Python/patches/Python-2.7.2-004_xcompile_fix_libffi_configure-0.1.patch b/packages/lang/Python/patches/Python-2.7.3-004_xcompile_fix_libffi_configure-0.1.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.2-004_xcompile_fix_libffi_configure-0.1.patch rename to packages/lang/Python/patches/Python-2.7.3-004_xcompile_fix_libffi_configure-0.1.patch diff --git a/packages/lang/Python/patches/Python-2.7.2-005_dont_generate_pyo_and_pyc_files-0.1.patch b/packages/lang/Python/patches/Python-2.7.3-005_dont_generate_pyo_and_pyc_files-0.1.patch similarity index 75% rename from packages/lang/Python/patches/Python-2.7.2-005_dont_generate_pyo_and_pyc_files-0.1.patch rename to packages/lang/Python/patches/Python-2.7.3-005_dont_generate_pyo_and_pyc_files-0.1.patch index 8dc36012c5..00b2fb1eb6 100644 --- a/packages/lang/Python/patches/Python-2.7.2-005_dont_generate_pyo_and_pyc_files-0.1.patch +++ b/packages/lang/Python/patches/Python-2.7.3-005_dont_generate_pyo_and_pyc_files-0.1.patch @@ -1,10 +1,10 @@ -diff -Naur Python-2.7.2/Makefile.pre.in Python-2.7.2.patch/Makefile.pre.in ---- Python-2.7.2/Makefile.pre.in 2011-10-30 11:41:31.642572564 +0100 -+++ Python-2.7.2.patch/Makefile.pre.in 2011-10-30 11:44:08.289571802 +0100 -@@ -928,24 +928,6 @@ - done; \ - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt +diff -Naur Python-2.7.3/Makefile.pre.in Python-2.7.3.patch/Makefile.pre.in +--- Python-2.7.3/Makefile.pre.in 2012-04-16 14:49:16.353716188 +0200 ++++ Python-2.7.3.patch/Makefile.pre.in 2012-04-16 14:50:03.740554039 +0200 +@@ -941,24 +941,6 @@ + $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ + $(DESTDIR)$(LIBDEST)/distutils/tests ; \ + fi - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ diff --git a/packages/lang/Python/patches/Python-2.7.2-008-reread-environment.patch b/packages/lang/Python/patches/Python-2.7.3-008-reread-environment.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.2-008-reread-environment.patch rename to packages/lang/Python/patches/Python-2.7.3-008-reread-environment.patch diff --git a/packages/lang/Python/patches/Python-2.7.2-010-change-pyconfig-h-location.patch b/packages/lang/Python/patches/Python-2.7.3-010-change-pyconfig-h-location.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.2-010-change-pyconfig-h-location.patch rename to packages/lang/Python/patches/Python-2.7.3-010-change-pyconfig-h-location.patch diff --git a/packages/lang/Python/patches/Python-2.7.2-015_no_static_lib.patch b/packages/lang/Python/patches/Python-2.7.3-015_no_static_lib.patch similarity index 100% rename from packages/lang/Python/patches/Python-2.7.2-015_no_static_lib.patch rename to packages/lang/Python/patches/Python-2.7.3-015_no_static_lib.patch