diff -r 193650beba33 -r 8a194ef19c9c python/python.patch --- a/python/python.patch Tue Jul 02 18:27:47 2013 +0200 +++ b/python/python.patch Tue Jul 02 21:15:12 2013 +0200 @@ -1,7 +1,7 @@ Index: configure --- configure.orig 2011-06-11 17:46:28.000000000 +0200 +++ configure 2011-12-11 16:42:17.000000000 +0100 -@@ -3920,9 +3920,9 @@ +@@ -4241,9 +4241,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 -@@ -5425,7 +5425,7 @@ +@@ -6232,7 +6232,7 @@ # debug builds. OPT="-g -O0 -Wall $STRICT_PROTO" else @@ -22,7 +22,7 @@ fi ;; *) -@@ -7813,7 +7813,7 @@ +@@ -8618,7 +8618,7 @@ then LINKFORSHARED="-Wl,--export-dynamic" fi;; @@ -34,18 +34,18 @@ Index: setup.py --- setup.py.orig 2011-06-11 17:46:28.000000000 +0200 +++ setup.py 2011-12-11 16:43:40.000000000 +0100 -@@ -369,8 +369,8 @@ - - def detect_modules(self): - # 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_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 -@@ -703,8 +703,6 @@ +@@ -439,8 +439,8 @@ + # directories (i.e. '.' and 'Include') must be first. See issue + # 10520. + if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- 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') + # only change this for cross builds for 3.3, issues on Mageia + if cross_compiling: + self.add_gcc_paths() +@@ -741,8 +741,6 @@ depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) search_for_ssl_incs_in = [ @@ -54,7 +54,7 @@ ] ssl_incs = find_file('openssl/ssl.h', inc_dirs, search_for_ssl_incs_in -@@ -715,8 +713,7 @@ +@@ -753,8 +751,7 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -64,7 +64,7 @@ ] ) if (ssl_incs is not None and -@@ -836,14 +833,8 @@ +@@ -866,14 +863,8 @@ # top of the normal inc_dirs. db_inc_paths = [ '/usr/include/db4', @@ -79,7 +79,7 @@ ] # 4.x minor number specific paths for x in gen_db_minor_ver_nums(4): -@@ -1731,6 +1722,7 @@ +@@ -1652,6 +1643,7 @@ dotversion = dotversion[:-1] + '.' + dotversion[-1] tcl_include_sub = [] tk_include_sub = []