python/python.patch@3429ba7ff8dc
python/python.patch
Tue, 20 Sep 2011 15:22:39 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 20 Sep 2011 15:22:39 +0200
- changeset 369
- 3429ba7ff8dc
- child 370
- 6475ac4895a9
- permissions
- -rw-r--r--
Import package vendor original specs for necessary manipulations.
1 Index: configure
2 --- configure.orig 2010-11-01 02:47:19.000000000 +0100
3 +++ configure 2010-12-05 18:07:39.000000000 +0100
4 @@ -3904,9 +3904,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 @@ -5352,7 +5352,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 @@ -7627,24 +7627,24 @@
26 FreeBSD*)
27 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
28 then
29 - LDSHARED='$(CC) -shared ${LDFLAGS}'
30 - LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
31 + LDSHARED="\$(CC) -shared ${LDFLAGS}"
32 + LDCXXSHARED="\$(CXX) -shared ${LDFLAGS}"
33 else
34 LDSHARED="ld -Bshareable ${LDFLAGS}"
35 fi;;
36 OpenBSD*)
37 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
38 then
39 - LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
40 - LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
41 + LDSHARED="\$(CC) -shared \$(CCSHARED) ${LDFLAGS}"
42 + LDCXXSHARED="\$(CXX) -shared \$(CCSHARED) ${LDFLAGS}"
43 else
44 case `uname -r` in
45 [01].* | 2.[0-7] | 2.[0-7].*)
46 LDSHARED="ld -Bshareable ${LDFLAGS}"
47 ;;
48 *)
49 - LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
50 - LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
51 + LDSHARED="\$(CC) -shared \$(CCSHARED) ${LDFLAGS}"
52 + LDCXXSHARED="\$(CXX) -shared \$(CCSHARED) ${LDFLAGS}"
53 ;;
54 esac
55 fi;;
56 @@ -7751,7 +7751,7 @@
57 then
58 LINKFORSHARED="-Wl,--export-dynamic"
59 fi;;
60 - SunOS/5*) case $CC in
61 + SunOS/5*) case gcc in
62 *gcc*)
63 if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
64 then
65 Index: setup.py
66 --- setup.py.orig 2010-10-31 17:40:21.000000000 +0100
67 +++ setup.py 2010-12-05 18:05:56.000000000 +0100
68 @@ -347,8 +347,8 @@
70 def detect_modules(self):
71 # Ensure that /usr/local is always used
72 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
73 - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
74 + add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib')
75 + add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include')
77 # Add paths specified in the environment variables LDFLAGS and
78 # CPPFLAGS for header and library files.
79 @@ -680,8 +680,6 @@
80 depends = ['socketmodule.h']) )
81 # Detect SSL support for the socket module (via _ssl)
82 search_for_ssl_incs_in = [
83 - '/usr/local/ssl/include',
84 - '/usr/contrib/ssl/include/'
85 ]
86 ssl_incs = find_file('openssl/ssl.h', inc_dirs,
87 search_for_ssl_incs_in
88 @@ -692,8 +690,7 @@
89 if krb5_h:
90 ssl_incs += krb5_h
91 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
92 - ['/usr/local/ssl/lib',
93 - '/usr/contrib/ssl/lib/'
94 + ['@l_prefix@/lib'
95 ] )
97 if (ssl_incs is not None and
98 @@ -813,14 +810,8 @@
99 # top of the normal inc_dirs.
100 db_inc_paths = [
101 '/usr/include/db4',
102 - '/usr/local/include/db4',
103 '/opt/sfw/include/db4',
104 - '/usr/include/db3',
105 - '/usr/local/include/db3',
106 - '/opt/sfw/include/db3',
107 - # Fink defaults (http://fink.sourceforge.net/)
108 '/sw/include/db4',
109 - '/sw/include/db3',
110 ]
111 # 4.x minor number specific paths
112 for x in gen_db_minor_ver_nums(4):
113 @@ -1708,6 +1699,7 @@
114 dotversion = dotversion[:-1] + '.' + dotversion[-1]
115 tcl_include_sub = []
116 tk_include_sub = []
117 + dotversion = ''
118 for dir in inc_dirs:
119 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
120 tk_include_sub += [dir + os.sep + "tk" + dotversion]
