diff -r 3429ba7ff8dc -r 6475ac4895a9 python/python.patch
--- a/python/python.patch	Tue Sep 20 15:22:39 2011 +0200
+++ b/python/python.patch	Tue Sep 20 15:24:08 2011 +0200
@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig	2010-11-01 02:47:19.000000000 +0100
 +++ configure	2010-12-05 18:07:39.000000000 +0100
-@@ -3904,9 +3904,9 @@
+@@ -3920,9 +3920,9 @@
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
@@ -13,7 +13,7 @@
    fi
  else
    if test "$GCC" = yes; then
-@@ -5352,7 +5352,7 @@
+@@ -5425,7 +5425,7 @@
  		# debug builds.
  		OPT="-g -O0 -Wall $STRICT_PROTO"
  	    else
@@ -22,38 +22,7 @@
  	    fi
  	    ;;
  	*)
-@@ -7627,24 +7627,24 @@
- 	FreeBSD*)
- 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
- 		then
--			LDSHARED='$(CC) -shared ${LDFLAGS}'
--			LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
-+			LDSHARED="\$(CC) -shared ${LDFLAGS}"
-+			LDCXXSHARED="\$(CXX) -shared ${LDFLAGS}"
- 		else
- 			LDSHARED="ld -Bshareable ${LDFLAGS}"
- 		fi;;
- 	OpenBSD*)
- 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
- 		then
--				LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
--				LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
-+				LDSHARED="\$(CC) -shared \$(CCSHARED) ${LDFLAGS}"
-+				LDCXXSHARED="\$(CXX) -shared \$(CCSHARED) ${LDFLAGS}"
- 		else
- 				case `uname -r` in
- 				[01].* | 2.[0-7] | 2.[0-7].*)
- 				   LDSHARED="ld -Bshareable ${LDFLAGS}"
- 				   ;;
- 				*)
--				   LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
--				   LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
-+				   LDSHARED="\$(CC) -shared \$(CCSHARED) ${LDFLAGS}"
-+				   LDCXXSHARED="\$(CXX) -shared \$(CCSHARED) ${LDFLAGS}"
- 				   ;;
- 				esac
- 		fi;;
-@@ -7751,7 +7751,7 @@
+@@ -7813,7 +7813,7 @@
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
@@ -65,7 +34,7 @@
 Index: setup.py
 --- setup.py.orig	2010-10-31 17:40:21.000000000 +0100
 +++ setup.py	2010-12-05 18:05:56.000000000 +0100
-@@ -347,8 +347,8 @@
+@@ -369,8 +369,8 @@
  
      def detect_modules(self):
          # Ensure that /usr/local is always used
@@ -73,10 +42,10 @@
 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 +        add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib')
 +        add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include')
+         self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
-@@ -680,8 +680,6 @@
+@@ -703,8 +703,6 @@
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
          search_for_ssl_incs_in = [
@@ -85,7 +54,7 @@
                               ]
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
                               search_for_ssl_incs_in
-@@ -692,8 +690,7 @@
+@@ -715,8 +713,7 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -95,7 +64,7 @@
                                       ] )
  
          if (ssl_incs is not None and
-@@ -813,14 +810,8 @@
+@@ -836,14 +833,8 @@
          # top of the normal inc_dirs.
          db_inc_paths = [
              '/usr/include/db4',
@@ -110,7 +79,7 @@
          ]
          # 4.x minor number specific paths
          for x in gen_db_minor_ver_nums(4):
-@@ -1708,6 +1699,7 @@
+@@ -1731,6 +1722,7 @@
                  dotversion = dotversion[:-1] + '.' + dotversion[-1]
              tcl_include_sub = []
              tk_include_sub = []
@@ -118,3 +87,4 @@
              for dir in inc_dirs:
                  tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
                  tk_include_sub += [dir + os.sep + "tk" + dotversion]
+Common subdirectories: Python-2.7.2.orig/Tools and Python-2.7.2/Tools