python/python.patch@d2d0020cfafa
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.
1 Index: configure
2 --- configure.orig 2011-06-11 17:46:28.000000000 +0200
3 +++ configure 2011-12-11 16:42:17.000000000 +0100
4 @@ -3920,9 +3920,9 @@
5 CFLAGS=$ac_save_CFLAGS
6 elif test $ac_cv_prog_cc_g = yes; then
7 if test "$GCC" = yes; then
8 - CFLAGS="-g -O2"
9 + CFLAGS="-O2"
10 else
11 - CFLAGS="-g"
12 + CFLAGS=""
13 fi
14 else
15 if test "$GCC" = yes; then
16 @@ -5425,7 +5425,7 @@
17 # debug builds.
18 OPT="-g -O0 -Wall $STRICT_PROTO"
19 else
20 - OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
21 + OPT="$WRAP -O3 -Wall $STRICT_PROTO"
22 fi
23 ;;
24 *)
25 @@ -7813,7 +7813,7 @@
26 then
27 LINKFORSHARED="-Wl,--export-dynamic"
28 fi;;
29 - SunOS/5*) case $CC in
30 + SunOS/5*) case gcc in
31 *gcc*)
32 if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
33 then
34 Index: setup.py
35 --- setup.py.orig 2011-06-11 17:46:28.000000000 +0200
36 +++ setup.py 2011-12-11 16:43:40.000000000 +0100
37 @@ -369,8 +369,8 @@
39 def detect_modules(self):
40 # Ensure that /usr/local is always used
41 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
42 - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
43 + add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib')
44 + add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include')
45 self.add_multiarch_paths()
47 # Add paths specified in the environment variables LDFLAGS and
48 @@ -703,8 +703,6 @@
49 depends = ['socketmodule.h']) )
50 # Detect SSL support for the socket module (via _ssl)
51 search_for_ssl_incs_in = [
52 - '/usr/local/ssl/include',
53 - '/usr/contrib/ssl/include/'
54 ]
55 ssl_incs = find_file('openssl/ssl.h', inc_dirs,
56 search_for_ssl_incs_in
57 @@ -715,8 +713,7 @@
58 if krb5_h:
59 ssl_incs += krb5_h
60 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
61 - ['/usr/local/ssl/lib',
62 - '/usr/contrib/ssl/lib/'
63 + ['@l_prefix@/lib'
64 ] )
66 if (ssl_incs is not None and
67 @@ -836,14 +833,8 @@
68 # top of the normal inc_dirs.
69 db_inc_paths = [
70 '/usr/include/db4',
71 - '/usr/local/include/db4',
72 '/opt/sfw/include/db4',
73 - '/usr/include/db3',
74 - '/usr/local/include/db3',
75 - '/opt/sfw/include/db3',
76 - # Fink defaults (http://fink.sourceforge.net/)
77 '/sw/include/db4',
78 - '/sw/include/db3',
79 ]
80 # 4.x minor number specific paths
81 for x in gen_db_minor_ver_nums(4):
82 @@ -1731,6 +1722,7 @@
83 dotversion = dotversion[:-1] + '.' + dotversion[-1]
84 tcl_include_sub = []
85 tk_include_sub = []
86 + dotversion = ''
87 for dir in inc_dirs:
88 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
89 tk_include_sub += [dir + os.sep + "tk" + dotversion]
