1.1 --- a/python/python.patch Tue Jul 02 18:27:47 2013 +0200
1.2 +++ b/python/python.patch Tue Jul 02 21:15:12 2013 +0200
1.3 @@ -1,7 +1,7 @@
1.4 Index: configure
1.5 --- configure.orig 2011-06-11 17:46:28.000000000 +0200
1.6 +++ configure 2011-12-11 16:42:17.000000000 +0100
1.7 -@@ -3920,9 +3920,9 @@
1.8 +@@ -4241,9 +4241,9 @@
1.9 CFLAGS=$ac_save_CFLAGS
1.10 elif test $ac_cv_prog_cc_g = yes; then
1.11 if test "$GCC" = yes; then
1.12 @@ -13,7 +13,7 @@
1.13 fi
1.14 else
1.15 if test "$GCC" = yes; then
1.16 -@@ -5425,7 +5425,7 @@
1.17 +@@ -6232,7 +6232,7 @@
1.18 # debug builds.
1.19 OPT="-g -O0 -Wall $STRICT_PROTO"
1.20 else
1.21 @@ -22,7 +22,7 @@
1.22 fi
1.23 ;;
1.24 *)
1.25 -@@ -7813,7 +7813,7 @@
1.26 +@@ -8618,7 +8618,7 @@
1.27 then
1.28 LINKFORSHARED="-Wl,--export-dynamic"
1.29 fi;;
1.30 @@ -34,18 +34,18 @@
1.31 Index: setup.py
1.32 --- setup.py.orig 2011-06-11 17:46:28.000000000 +0200
1.33 +++ setup.py 2011-12-11 16:43:40.000000000 +0100
1.34 -@@ -369,8 +369,8 @@
1.35 -
1.36 - def detect_modules(self):
1.37 - # Ensure that /usr/local is always used
1.38 -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
1.39 -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
1.40 -+ add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib')
1.41 -+ add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include')
1.42 - self.add_multiarch_paths()
1.43 -
1.44 - # Add paths specified in the environment variables LDFLAGS and
1.45 -@@ -703,8 +703,6 @@
1.46 +@@ -439,8 +439,8 @@
1.47 + # directories (i.e. '.' and 'Include') must be first. See issue
1.48 + # 10520.
1.49 + if not cross_compiling:
1.50 +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
1.51 +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
1.52 ++ add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib')
1.53 ++ add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include')
1.54 + # only change this for cross builds for 3.3, issues on Mageia
1.55 + if cross_compiling:
1.56 + self.add_gcc_paths()
1.57 +@@ -741,8 +741,6 @@
1.58 depends = ['socketmodule.h']) )
1.59 # Detect SSL support for the socket module (via _ssl)
1.60 search_for_ssl_incs_in = [
1.61 @@ -54,7 +54,7 @@
1.62 ]
1.63 ssl_incs = find_file('openssl/ssl.h', inc_dirs,
1.64 search_for_ssl_incs_in
1.65 -@@ -715,8 +713,7 @@
1.66 +@@ -753,8 +751,7 @@
1.67 if krb5_h:
1.68 ssl_incs += krb5_h
1.69 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
1.70 @@ -64,7 +64,7 @@
1.71 ] )
1.72
1.73 if (ssl_incs is not None and
1.74 -@@ -836,14 +833,8 @@
1.75 +@@ -866,14 +863,8 @@
1.76 # top of the normal inc_dirs.
1.77 db_inc_paths = [
1.78 '/usr/include/db4',
1.79 @@ -79,7 +79,7 @@
1.80 ]
1.81 # 4.x minor number specific paths
1.82 for x in gen_db_minor_ver_nums(4):
1.83 -@@ -1731,6 +1722,7 @@
1.84 +@@ -1652,6 +1643,7 @@
1.85 dotversion = dotversion[:-1] + '.' + dotversion[-1]
1.86 tcl_include_sub = []
1.87 tk_include_sub = []
