You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
91 lines
3.1 KiB
91 lines
3.1 KiB
Index: configure |
|
--- configure.orig 2015-09-13 13:41:26.000000000 +0200 |
|
+++ configure 2015-09-13 18:24:50.435730987 +0200 |
|
@@ -4298,9 +4298,9 @@ |
|
CFLAGS=$ac_save_CFLAGS |
|
elif test $ac_cv_prog_cc_g = yes; then |
|
if test "$GCC" = yes; then |
|
- CFLAGS="-g -O2" |
|
+ CFLAGS="-O2" |
|
else |
|
- CFLAGS="-g" |
|
+ CFLAGS="" |
|
fi |
|
else |
|
if test "$GCC" = yes; then |
|
@@ -6476,7 +6476,7 @@ |
|
OPT="-g -O0 -Wall $STRICT_PROTO" |
|
fi |
|
else |
|
- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" |
|
+ OPT="$WRAP -O3 -Wall $STRICT_PROTO" |
|
fi |
|
;; |
|
*) |
|
@@ -8995,7 +8995,7 @@ |
|
then |
|
LINKFORSHARED="-Wl,--export-dynamic" |
|
fi;; |
|
- SunOS/5*) case $CC in |
|
+ SunOS/5*) case gcc in |
|
*gcc*) |
|
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
|
then |
|
Index: setup.py |
|
--- setup.py.orig 2015-09-13 13:41:26.000000000 +0200 |
|
+++ setup.py 2015-09-13 18:25:00.565776636 +0200 |
|
@@ -465,12 +465,6 @@ |
|
os.unlink(tmpfile) |
|
|
|
def detect_modules(self): |
|
- # Ensure that /usr/local is always used, but the local build |
|
- # directories (i.e. '.' and 'Include') must be first. See issue |
|
- # 10520. |
|
- if not cross_compiling: |
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
|
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
|
# only change this for cross builds for 3.3, issues on Mageia |
|
if cross_compiling: |
|
self.add_gcc_paths() |
|
@@ -779,8 +773,6 @@ |
|
depends = ['socketmodule.h']) ) |
|
# Detect SSL support for the socket module (via _ssl) |
|
search_for_ssl_incs_in = [ |
|
- '/usr/local/ssl/include', |
|
- '/usr/contrib/ssl/include/' |
|
] |
|
ssl_incs = find_file('openssl/ssl.h', inc_dirs, |
|
search_for_ssl_incs_in |
|
@@ -791,8 +783,7 @@ |
|
if krb5_h: |
|
ssl_incs += krb5_h |
|
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, |
|
- ['/usr/local/ssl/lib', |
|
- '/usr/contrib/ssl/lib/' |
|
+ [ |
|
] ) |
|
|
|
if (ssl_incs is not None and |
|
@@ -904,14 +895,8 @@ |
|
# top of the normal inc_dirs. |
|
db_inc_paths = [ |
|
'/usr/include/db4', |
|
- '/usr/local/include/db4', |
|
'/opt/sfw/include/db4', |
|
- '/usr/include/db3', |
|
- '/usr/local/include/db3', |
|
- '/opt/sfw/include/db3', |
|
- # Fink defaults (http://fink.sourceforge.net/) |
|
'/sw/include/db4', |
|
- '/sw/include/db3', |
|
] |
|
# 4.x minor number specific paths |
|
for x in gen_db_minor_ver_nums(4): |
|
@@ -1748,6 +1733,7 @@ |
|
dotversion = dotversion[:-1] + '.' + dotversion[-1] |
|
tcl_include_sub = [] |
|
tk_include_sub = [] |
|
+ dotversion = '' |
|
for dir in inc_dirs: |
|
tcl_include_sub += [dir + os.sep + "tcl" + dotversion] |
|
tk_include_sub += [dir + os.sep + "tk" + dotversion]
|
|
|