|
|
|
@ -1,7 +1,7 @@ |
|
|
|
Index: configure
|
|
|
|
Index: configure
|
|
|
|
--- configure.orig 2018-06-27 05:07:35.000000000 +0200
|
|
|
|
--- configure.orig 2019-10-14 15:34:47.000000000 +0200
|
|
|
|
+++ configure 2018-06-28 18:43:29.911008000 +0200
|
|
|
|
+++ configure 2019-10-15 08:31:40.689832000 +0200
|
|
|
|
@@ -4248,9 +4248,9 @@
|
|
|
|
@@ -4225,9 +4225,9 @@
|
|
|
|
CFLAGS=$ac_save_CFLAGS
|
|
|
|
CFLAGS=$ac_save_CFLAGS
|
|
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
|
|
if test "$GCC" = yes; then
|
|
|
|
if test "$GCC" = yes; then
|
|
|
|
@ -13,7 +13,7 @@ Index: configure |
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
if test "$GCC" = yes; then
|
|
|
|
if test "$GCC" = yes; then
|
|
|
|
@@ -6769,7 +6769,7 @@
|
|
|
|
@@ -6883,7 +6883,7 @@
|
|
|
|
OPT="-g -O0 -Wall"
|
|
|
|
OPT="-g -O0 -Wall"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@ -22,7 +22,7 @@ Index: configure |
|
|
|
fi
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
*)
|
|
|
|
@@ -9427,7 +9427,7 @@
|
|
|
|
@@ -9541,7 +9541,7 @@
|
|
|
|
then
|
|
|
|
then
|
|
|
|
LINKFORSHARED="-Wl,--export-dynamic"
|
|
|
|
LINKFORSHARED="-Wl,--export-dynamic"
|
|
|
|
fi;;
|
|
|
|
fi;;
|
|
|
|
@ -32,22 +32,22 @@ Index: configure |
|
|
|
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|
|
|
|
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|
|
|
|
then
|
|
|
|
then
|
|
|
|
Index: setup.py
|
|
|
|
Index: setup.py
|
|
|
|
--- setup.py.orig 2018-06-27 05:07:35.000000000 +0200
|
|
|
|
--- setup.py.orig 2019-10-14 15:34:47.000000000 +0200
|
|
|
|
+++ setup.py 2018-06-28 08:53:40.460014000 +0200
|
|
|
|
+++ setup.py 2019-10-15 08:32:33.256019000 +0200
|
|
|
|
@@ -537,12 +537,6 @@
|
|
|
|
@@ -645,12 +645,6 @@
|
|
|
|
os.unlink(tmpfile)
|
|
|
|
add_dir_to_list(dir_list, directory)
|
|
|
|
|
|
|
|
|
|
|
|
def detect_modules(self):
|
|
|
|
def configure_compiler(self):
|
|
|
|
- # Ensure that /usr/local is always used, but the local build
|
|
|
|
- # Ensure that /usr/local is always used, but the local build
|
|
|
|
- # directories (i.e. '.' and 'Include') must be first. See issue
|
|
|
|
- # directories (i.e. '.' and 'Include') must be first. See issue
|
|
|
|
- # 10520.
|
|
|
|
- # 10520.
|
|
|
|
- if not cross_compiling:
|
|
|
|
- if not CROSS_COMPILING:
|
|
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
|
|
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
|
|
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
|
|
# only change this for cross builds for 3.3, issues on Mageia
|
|
|
|
# only change this for cross builds for 3.3, issues on Mageia
|
|
|
|
if cross_compiling:
|
|
|
|
if CROSS_COMPILING:
|
|
|
|
self.add_gcc_paths()
|
|
|
|
self.add_cross_compiling_paths()
|
|
|
|
@@ -959,14 +953,8 @@
|
|
|
|
@@ -1097,14 +1091,8 @@
|
|
|
|
# top of the normal inc_dirs.
|
|
|
|
# top of the normal inc_dirs.
|
|
|
|
db_inc_paths = [
|
|
|
|
db_inc_paths = [
|
|
|
|
'/usr/include/db4',
|
|
|
|
'/usr/include/db4',
|
|
|
|
@ -62,11 +62,11 @@ Index: setup.py |
|
|
|
]
|
|
|
|
]
|
|
|
|
# 4.x minor number specific paths
|
|
|
|
# 4.x minor number specific paths
|
|
|
|
for x in gen_db_minor_ver_nums(4):
|
|
|
|
for x in gen_db_minor_ver_nums(4):
|
|
|
|
@@ -1814,6 +1802,7 @@
|
|
|
|
@@ -1879,6 +1867,7 @@
|
|
|
|
dotversion = dotversion[:-1] + '.' + dotversion[-1]
|
|
|
|
dotversion = dotversion[:-1] + '.' + dotversion[-1]
|
|
|
|
tcl_include_sub = []
|
|
|
|
tcl_include_sub = []
|
|
|
|
tk_include_sub = []
|
|
|
|
tk_include_sub = []
|
|
|
|
+ dotversion = ''
|
|
|
|
+ dotversion = ''
|
|
|
|
for dir in inc_dirs:
|
|
|
|
for dir in self.inc_dirs:
|
|
|
|
tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
|
|
|
|
tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
|
|
|
|
tk_include_sub += [dir + os.sep + "tk" + dotversion]
|
|
|
|
tk_include_sub += [dir + os.sep + "tk" + dotversion]
|
|
|
|
|
