python/python.patch@d2d0020cfafa (annotated)
python/python.patch
Tue, 28 Aug 2012 18:29:30 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:29:30 +0200
- changeset 534
- d2d0020cfafa
- parent 370
- 6475ac4895a9
- child 784
- 8a194ef19c9c
- permissions
- -rw-r--r--
Update from Drupal 6.x to 7.x and introduce several new HTML5 themes. Because
many themes from Drupal 6.x have since been abandoned, left unmaintained, or
not ported to Drupal 7.x, this package has changed in size and utility.
| 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@370 | 4 | @@ -3920,9 +3920,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@370 | 16 | @@ -5425,7 +5425,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@370 | 25 | @@ -7813,7 +7813,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@370 | 37 | @@ -369,8 +369,8 @@ |
| michael@369 | 38 | |
| michael@369 | 39 | def detect_modules(self): |
| michael@369 | 40 | # Ensure that /usr/local is always used |
| michael@369 | 41 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
| michael@369 | 42 | - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
| michael@369 | 43 | + add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib') |
| michael@369 | 44 | + add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include') |
| michael@370 | 45 | self.add_multiarch_paths() |
| michael@369 | 46 | |
| michael@369 | 47 | # Add paths specified in the environment variables LDFLAGS and |
| michael@370 | 48 | @@ -703,8 +703,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@370 | 57 | @@ -715,8 +713,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@370 | 67 | @@ -836,14 +833,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@370 | 82 | @@ -1731,6 +1722,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] |
