python: Port the python2.4 patches to 2.7

diff -rduNp Python-2.4.2-010/Python/import.c Python-2.4.2/Python/import.c

--- Python-2.4.2-010/Python/import.c	2005-09-14 20:15:03.000000000 +0200

+++ Python-2.4.2/Python/import.c	2007-01-22 19:49:18.000000000 +0100

@@ -822,8 +822,12 @@ static void

 write_compiled_module(PyCodeObject *co, char *cpathname, long mtime)

 {

 	FILE *fp;

-

-	fp = open_exclusive(cpathname);

+   char *py_dontcompile = getenv("PYTHON_DONTCOMPILE");

+   

+   if (!py_dontcompile) 

+     fp = open_exclusive(cpathname);

+   else

+     fp = NULL;

 	if (fp == NULL) {

 		if (Py_VerboseFlag)

 			PySys_WriteStderr(

diff -rduNp Python-2.4.2.orig/Makefile.pre.in Python-2.4.2/Makefile.pre.in

--- Python-2.4.2.orig/Makefile.pre.in	2005-03-29 01:23:01.000000000 +0200

+++ Python-2.4.2/Makefile.pre.in	2007-01-22 19:37:08.000000000 +0100

@@ -162,6 +162,7 @@ UNICODE_OBJS=   @UNICODE_OBJS@

Add cross-compilation support in the python Makefile and setup.py since

python has no such support.

 PYTHON=		python$(EXE)

 BUILDPYTHON=	python$(BUILDEXE)

+HOSTPYTHON=	$(BUILDPYTHON)

The main point here is to first build a python interpreter to run on the

host, and then use it to compile the target python.

 # === Definitions added by makesetup ===

We also remove some error-generating code that is irrelevant in our

situation, such as checking if we can import a cross-compiled module.

@@ -188,7 +189,7 @@ GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar

 ##########################################################################

 # Parser

 PGEN=		Parser/pgen$(EXE)

-

+HOSTPGEN=	$(PGEN)$(EXE)

 POBJS=		\

 		Parser/acceler.o \

 		Parser/grammar1.o \

@@ -320,8 +321,8 @@ platform: $(BUILDPYTHON)

Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>

diff -rduNp Python-2.7.orig/Makefile.pre.in Python-2.7/Makefile.pre.in

--- Python-2.7.orig/Makefile.pre.in	2010-04-12 02:10:46.000000000 +0200

+++ Python-2.7/Makefile.pre.in	2010-09-21 16:46:07.000000000 +0200

@@ -404,8 +404,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;; \

 	@case $$MAKEFLAGS in \

-	*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

 # buildno should really depend on something like LIBRARY_SRC

@@ -442,7 +443,7 @@ Modules/ccpython.o: $(srcdir)/Modules/cc

 # Build static library

@@ -538,7 +538,7 @@ Modules/python.o: $(srcdir)/Modules/pyth

 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)

 		-@$(INSTALL) -d Include

-		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)

+		-$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)

 $(PGEN):	$(PGENOBJS)

 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)

@@ -719,19 +720,19 @@ libinstall:	$(BUILDPYTHON) $(srcdir)/Lib

@@ -920,25 +920,25 @@ libinstall:	build_all $(srcdir)/Lib/$(PL

 	done

 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt

 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \

-		./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \

+		$(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \

 		-d $(LIBDEST) -f \

 		-x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)

 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \

 		$(DESTDIR)$(LIBDEST)

 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \

-		./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \

+		$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \

 		-d $(LIBDEST) -f \

 		-x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)

 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \

 		$(DESTDIR)$(LIBDEST)

 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \

-		./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \

+		$(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \

+		$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \

 		-d $(LIBDEST)/site-packages -f \

 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages

 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \

-		./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"

+		$(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"

@@ -826,7 +827,7 @@ libainstall:	all

 # Create the PLATDIR source directory, if one wasn't distributed..

 $(srcdir)/Lib/$(PLATDIR):

@@ -1043,7 +1043,7 @@ libainstall:	all python-config

 # Install the dynamically loadable modules

 # This goes into $(exec_prefix)

 sharedinstall:

 	   	--prefix=$(prefix) \

 		--install-scripts=$(BINDIR) \

 		--install-platlib=$(DESTSHARED) \

diff -rduNp Python-2.4.2.orig/setup.py Python-2.4.2/setup.py

--- Python-2.4.2.orig/setup.py	2005-03-09 23:27:24.000000000 +0100

+++ Python-2.4.2/setup.py	2007-01-22 19:37:08.000000000 +0100

@@ -204,6 +204,7 @@ class PyBuildExt(build_ext):

diff -rduNp Python-2.7.orig/setup.py Python-2.7/setup.py

--- Python-2.7.orig/setup.py	2010-06-27 14:36:16.000000000 +0200

+++ Python-2.7/setup.py	2010-09-21 16:59:59.000000000 +0200

@@ -310,9 +310,9 @@ class PyBuildExt(build_ext):

         try:

             imp.load_dynamic(ext.name, ext_filename)

         except ImportError, why:

-            self.failed.append(ext.name)

-            self.announce('*** WARNING: renaming "%s" since importing it'

-                          ' failed: %s' % (ext.name, why), level=3)

+            self.announce('*** WARNING: Importing "%s" failed, probably '

+                          'because of cross-compilation' % ext.name, level=3)

+            return

             self.announce('*** WARNING: renaming "%s" since importing it'

                           ' failed: %s' % (ext.name, why), level=3)

             assert not self.inplace

@@ -239,8 +240,6 @@ class PyBuildExt(build_ext):

             basename, tail = os.path.splitext(ext_filename)

             newname = basename + "_failed" + tail

@@ -346,10 +346,6 @@ class PyBuildExt(build_ext):

         return sys.platform

     def detect_modules(self):

         # Ensure that /usr/local is always used

-        # Ensure that /usr/local is always used

-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')

-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')

         # Add paths to popular package managers on OS X/darwin

         if sys.platform == "darwin":

@@ -251,12 +250,6 @@ class PyBuildExt(build_ext):

             add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')

             add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')

-

         # Add paths specified in the environment variables LDFLAGS and

         # CPPFLAGS for header and library files.

         # We must get the values from the Makefile and not the environment

@@ -384,12 +380,6 @@ class PyBuildExt(build_ext):

                     for directory in reversed(options.dirs):

                         add_dir_to_list(dir_list, directory)

-        if os.path.normpath(sys.prefix) != '/usr':

-            add_dir_to_list(self.compiler.library_dirs,

--- Python-2.4.2-001/setup.py	2007-01-23 16:18:37.000000000 +0100

+++ Python-2.4.2/setup.py	2007-01-23 16:26:43.000000000 +0100

@@ -239,7 +239,18 @@

Second patch to bring cross-compilation support to python build-system.

Allow the libraries detection routine to look for headers and libs in

other directories than /usr/include or /usr/lib through the env variables

PYTHON_MODULES_INCLUDE and PYTHON_MODULES_LIB.

We can then use it to look for libraries in the buildroot staging directory.

Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>

diff -rduNp Python-2.7.orig/setup.py Python-2.7/setup.py

--- Python-2.7.orig/setup.py	2010-09-21 17:15:31.000000000 +0200

+++ Python-2.7/setup.py	2010-09-21 17:20:46.000000000 +0200

@@ -346,6 +346,18 @@ class PyBuildExt(build_ext):

         return sys.platform

     def detect_modules(self):

-        # Ensure that /usr/local is always used

+        try:

+            modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split()

+        except KeyError:

+        try:

+            modules_lib_dirs = os.environ["PYTHON_MODULES_LIB"].split()

+        except KeyError:

+            modules_lib_dirs = ['/usr/lib']

+            modules_include_dirs = ['/usr/lib']

+        for dir in modules_include_dirs:

+            add_dir_to_list(self.compiler.include_dirs, dir)

+        for dir in modules_lib_dirs:

+            add_dir_to_list(self.compiler.library_dirs, dir)

         # Add paths to popular package managers on OS X/darwin

         if sys.platform == "darwin":

@@ -258,11 +269,8 @@

         # Add paths specified in the environment variables LDFLAGS and

         # CPPFLAGS for header and library files.

         # We must get the values from the Makefile and not the environment

@@ -388,11 +400,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.

+        lib_dirs = self.compiler.library_dirs

+        inc_dirs = self.compiler.include_dirs

         exts = []

         missing = []

         platform = self.get_platform()

diff -rduNp Python-2.4.2-002/setup.py Python-2.4.2/setup.py

--- Python-2.4.2-002/setup.py	2007-01-22 19:41:47.000000000 +0100

+++ Python-2.4.2/setup.py	2007-01-22 19:47:25.000000000 +0100

@@ -15,7 +15,14 @@ from distutils.command.install import in

 from distutils.command.install_lib import install_lib

Support some customisation on python compilation.

With this patch, we can now remove some modules introducing external

dependencies from the compilation, thus removing these irrelevant in most

cases dependencies (ie. openssl, ncurses, etc).

This modules can be removed by listing them in the PYTHON_DISABLE_MODULES

environment variable.

Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>

diff -rduNp Python-2.7.orig/setup.py Python-2.7/setup.py

--- Python-2.7.orig/setup.py	2010-09-21 17:31:52.000000000 +0200

+++ Python-2.7/setup.py	2010-09-21 17:35:20.000000000 +0200

@@ -21,7 +21,15 @@ from distutils.spawn import find_executa

 COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')

 # This global variable is used to hold the list of modules to be disabled.

-disabled_module_list = []

+try:

+    disabled_module_list = os.environ["PYTHON_DISABLE_MODULES"].split()

+except KeyError:

+	disabled_module_list = []

+    disabled_module_list = list()

+

+try:

+    disable_ssl = os.environ["PYTHON_DISABLE_SSL"]

+except KeyError:

 def add_dir_to_list(dirlist, dir):

     """Add the directory 'dir' to the list 'dirlist' (at the front) if

@@ -247,6 +254,7 @@ class PyBuildExt(build_ext):

@@ -346,6 +354,7 @@ class PyBuildExt(build_ext):

         return sys.platform

     def detect_modules(self):

         try:

             modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split()

         except KeyError:

@@ -468,7 +476,8 @@ class PyBuildExt(build_ext):

@@ -685,7 +694,8 @@ class PyBuildExt(build_ext):

                                      ] )

         if (ssl_incs is not None and

This patch purpose is to allow not to save the generated python bytecode in

a file for later use through the PYTHON_DONTCOMPILE environment variable.

I do not see the use of it, because you can choose if you want but it seems

somewhat related to gentoo.

Maybe useful when the generated rootfs is mounted on read-only on the target.

Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>

diff -rduNp Python-2.7.orig/Python/import.c Python-2.7/Python/import.c

--- Python-2.7.orig/Python/import.c	2010-09-30 12:05:53.000000000 +0200

+++ Python-2.7/Python/import.c	2010-09-30 12:20:38.000000000 +0200

@@ -886,7 +886,12 @@ write_compiled_module(PyCodeObject *co,

     mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH;

 #endif

-    fp = open_exclusive(cpathname, mode);

+    char *py_dontcompile = getenv("PYTHON_DONTCOMPILE");

+

+    if (!py_dontcompile)

+      fp = open_exclusive(cpathname, mode);

+    else

+      fp = NULL;

     if (fp == NULL) {

         if (Py_VerboseFlag)

             PySys_WriteStderr(