1:98f9b7409dd7 | 2:2cfc0d19c920 |
---|---|
1 Index: configure | 1 Index: configure |
2 --- configure.orig 2010-11-01 02:47:19.000000000 +0100 | 2 --- configure.orig 2011-06-11 17:46:28.000000000 +0200 |
3 +++ configure 2010-12-05 18:07:39.000000000 +0100 | 3 +++ configure 2011-12-11 16:42:17.000000000 +0100 |
4 @@ -3920,9 +3920,9 @@ | 4 @@ -3920,9 +3920,9 @@ |
5 CFLAGS=$ac_save_CFLAGS | 5 CFLAGS=$ac_save_CFLAGS |
6 elif test $ac_cv_prog_cc_g = yes; then | 6 elif test $ac_cv_prog_cc_g = yes; then |
7 if test "$GCC" = yes; then | 7 if test "$GCC" = yes; then |
8 - CFLAGS="-g -O2" | 8 - CFLAGS="-g -O2" |
30 + SunOS/5*) case gcc in | 30 + SunOS/5*) case gcc in |
31 *gcc*) | 31 *gcc*) |
32 if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null | 32 if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
33 then | 33 then |
34 Index: setup.py | 34 Index: setup.py |
35 --- setup.py.orig 2010-10-31 17:40:21.000000000 +0100 | 35 --- setup.py.orig 2011-06-11 17:46:28.000000000 +0200 |
36 +++ setup.py 2010-12-05 18:05:56.000000000 +0100 | 36 +++ setup.py 2011-12-11 16:43:40.000000000 +0100 |
37 @@ -369,8 +369,8 @@ | 37 @@ -369,8 +369,8 @@ |
38 | 38 |
39 def detect_modules(self): | 39 def detect_modules(self): |
40 # Ensure that /usr/local is always used | 40 # Ensure that /usr/local is always used |
41 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | 41 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
85 tk_include_sub = [] | 85 tk_include_sub = [] |
86 + dotversion = '' | 86 + dotversion = '' |
87 for dir in inc_dirs: | 87 for dir in inc_dirs: |
88 tcl_include_sub += [dir + os.sep + "tcl" + dotversion] | 88 tcl_include_sub += [dir + os.sep + "tcl" + dotversion] |
89 tk_include_sub += [dir + os.sep + "tk" + dotversion] | 89 tk_include_sub += [dir + os.sep + "tk" + dotversion] |
90 Common subdirectories: Python-2.7.2.orig/Tools and Python-2.7.2/Tools |