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.
72 lines
2.3 KiB
72 lines
2.3 KiB
Index: configure |
|
--- configure.orig 2018-06-27 05:07:35.000000000 +0200 |
|
+++ configure 2018-06-28 18:43:29.911008000 +0200 |
|
@@ -4248,9 +4248,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 |
|
@@ -6769,7 +6769,7 @@ |
|
OPT="-g -O0 -Wall" |
|
fi |
|
else |
|
- OPT="-g $WRAP -O3 -Wall" |
|
+ OPT="$WRAP -O3 -Wall" |
|
fi |
|
;; |
|
*) |
|
@@ -9427,7 +9427,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 2018-06-27 05:07:35.000000000 +0200 |
|
+++ setup.py 2018-06-28 08:53:40.460014000 +0200 |
|
@@ -537,12 +537,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() |
|
@@ -959,14 +953,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): |
|
@@ -1814,6 +1802,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]
|
|
|