python/python.patch@8a194ef19c9c (annotated)
python/python.patch
Tue, 02 Jul 2013 21:15:12 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 02 Jul 2013 21:15:12 +0200
- changeset 784
- 8a194ef19c9c
- parent 524
- 241043c7d657
- permissions
- -rw-r--r--
Update to new vendor version and adjust dependencies to correct build.
| michael@369 | 1 | Index: configure |
| michael@524 | 2 | --- configure.orig 2011-06-11 17:46:28.000000000 +0200 |
| michael@524 | 3 | +++ configure 2011-12-11 16:42:17.000000000 +0100 |
| michael@784 | 4 | @@ -4241,9 +4241,9 @@ |
| michael@369 | 5 | CFLAGS=$ac_save_CFLAGS |
| michael@369 | 6 | elif test $ac_cv_prog_cc_g = yes; then |
| michael@369 | 7 | if test "$GCC" = yes; then |
| michael@369 | 8 | - CFLAGS="-g -O2" |
| michael@369 | 9 | + CFLAGS="-O2" |
| michael@369 | 10 | else |
| michael@369 | 11 | - CFLAGS="-g" |
| michael@369 | 12 | + CFLAGS="" |
| michael@369 | 13 | fi |
| michael@369 | 14 | else |
| michael@369 | 15 | if test "$GCC" = yes; then |
| michael@784 | 16 | @@ -6232,7 +6232,7 @@ |
| michael@369 | 17 | # debug builds. |
| michael@369 | 18 | OPT="-g -O0 -Wall $STRICT_PROTO" |
| michael@369 | 19 | else |
| michael@369 | 20 | - OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" |
| michael@369 | 21 | + OPT="$WRAP -O3 -Wall $STRICT_PROTO" |
| michael@369 | 22 | fi |
| michael@369 | 23 | ;; |
| michael@369 | 24 | *) |
| michael@784 | 25 | @@ -8618,7 +8618,7 @@ |
| michael@369 | 26 | then |
| michael@369 | 27 | LINKFORSHARED="-Wl,--export-dynamic" |
| michael@369 | 28 | fi;; |
| michael@369 | 29 | - SunOS/5*) case $CC in |
| michael@369 | 30 | + SunOS/5*) case gcc in |
| michael@369 | 31 | *gcc*) |
| michael@369 | 32 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
| michael@369 | 33 | then |
| michael@369 | 34 | Index: setup.py |
| michael@524 | 35 | --- setup.py.orig 2011-06-11 17:46:28.000000000 +0200 |
| michael@524 | 36 | +++ setup.py 2011-12-11 16:43:40.000000000 +0100 |
| michael@784 | 37 | @@ -439,8 +439,8 @@ |
| michael@784 | 38 | # directories (i.e. '.' and 'Include') must be first. See issue |
| michael@784 | 39 | # 10520. |
| michael@784 | 40 | if not cross_compiling: |
| michael@784 | 41 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
| michael@784 | 42 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
| michael@784 | 43 | + add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib') |
| michael@784 | 44 | + add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include') |
| michael@784 | 45 | # only change this for cross builds for 3.3, issues on Mageia |
| michael@784 | 46 | if cross_compiling: |
| michael@784 | 47 | self.add_gcc_paths() |
| michael@784 | 48 | @@ -741,8 +741,6 @@ |
| michael@369 | 49 | depends = ['socketmodule.h']) ) |
| michael@369 | 50 | # Detect SSL support for the socket module (via _ssl) |
| michael@369 | 51 | search_for_ssl_incs_in = [ |
| michael@369 | 52 | - '/usr/local/ssl/include', |
| michael@369 | 53 | - '/usr/contrib/ssl/include/' |
| michael@369 | 54 | ] |
| michael@369 | 55 | ssl_incs = find_file('openssl/ssl.h', inc_dirs, |
| michael@369 | 56 | search_for_ssl_incs_in |
| michael@784 | 57 | @@ -753,8 +751,7 @@ |
| michael@369 | 58 | if krb5_h: |
| michael@369 | 59 | ssl_incs += krb5_h |
| michael@369 | 60 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, |
| michael@369 | 61 | - ['/usr/local/ssl/lib', |
| michael@369 | 62 | - '/usr/contrib/ssl/lib/' |
| michael@369 | 63 | + ['@l_prefix@/lib' |
| michael@369 | 64 | ] ) |
| michael@369 | 65 | |
| michael@369 | 66 | if (ssl_incs is not None and |
| michael@784 | 67 | @@ -866,14 +863,8 @@ |
| michael@369 | 68 | # top of the normal inc_dirs. |
| michael@369 | 69 | db_inc_paths = [ |
| michael@369 | 70 | '/usr/include/db4', |
| michael@369 | 71 | - '/usr/local/include/db4', |
| michael@369 | 72 | '/opt/sfw/include/db4', |
| michael@369 | 73 | - '/usr/include/db3', |
| michael@369 | 74 | - '/usr/local/include/db3', |
| michael@369 | 75 | - '/opt/sfw/include/db3', |
| michael@369 | 76 | - # Fink defaults (http://fink.sourceforge.net/) |
| michael@369 | 77 | '/sw/include/db4', |
| michael@369 | 78 | - '/sw/include/db3', |
| michael@369 | 79 | ] |
| michael@369 | 80 | # 4.x minor number specific paths |
| michael@369 | 81 | for x in gen_db_minor_ver_nums(4): |
| michael@784 | 82 | @@ -1652,6 +1643,7 @@ |
| michael@369 | 83 | dotversion = dotversion[:-1] + '.' + dotversion[-1] |
| michael@369 | 84 | tcl_include_sub = [] |
| michael@369 | 85 | tk_include_sub = [] |
| michael@369 | 86 | + dotversion = '' |
| michael@369 | 87 | for dir in inc_dirs: |
| michael@369 | 88 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] |
| michael@369 | 89 | tk_include_sub += [dir + os.sep + "tk" + dotversion] |
