edc01d04d6
* Initial python-3.7 port * python3: Add setup.config.in to remove before patching * python3: Implement setenv for mingw. Fix building with NT threads. Build with unicode * Fix typos * Fix linking core modules * Mingw build have exec_prefix * Remove deprecated patch * Fix building python and modules. Failing to build readline module and install not working yet * More getpath changes and more aggressive path separator conversion * Fix readline module compilation and linking errors * python3: By default building with posix threads, NT threads are broken. Some patches optimization. First buildable commit * Py_DecodeLocale handle char, not wchar * Fix building multiprocessing module with posix threads
60 lines
2.9 KiB
Diff
60 lines
2.9 KiB
Diff
diff -Naur Python-3.7.0-orig/setup.py Python-3.7.0/setup.py
|
|
--- Python-3.7.0-orig/setup.py 2018-06-30 11:17:33.499958200 +0300
|
|
+++ Python-3.7.0/setup.py 2018-06-30 11:17:33.733958600 +0300
|
|
@@ -476,7 +476,7 @@
|
|
# Debian/Ubuntu multiarch support.
|
|
# https://wiki.ubuntu.com/MultiarchSpec
|
|
cc = sysconfig.get_config_var('CC')
|
|
- tmpfile = os.path.join(self.build_temp, 'multiarch')
|
|
+ tmpfile = os.path.join(self.build_temp, 'multiarch').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
ret = os.system(
|
|
@@ -501,7 +501,7 @@
|
|
opt = ''
|
|
if cross_compiling:
|
|
opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
|
|
- tmpfile = os.path.join(self.build_temp, 'multiarch')
|
|
+ tmpfile = os.path.join(self.build_temp, 'multiarch').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
ret = os.system(
|
|
@@ -520,7 +520,7 @@
|
|
|
|
def add_gcc_paths(self):
|
|
gcc = sysconfig.get_config_var('CC')
|
|
- tmpfile = os.path.join(self.build_temp, 'gccpaths')
|
|
+ tmpfile = os.path.join(self.build_temp, 'gccpaths').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
|
|
@@ -811,7 +811,7 @@
|
|
readline_termcap_library = ""
|
|
curses_library = ""
|
|
# Cannot use os.popen here in py3k.
|
|
- tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib')
|
|
+ tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
# Determine if readline is already linked against curses or tinfo.
|
|
@@ -1801,16 +1801,16 @@
|
|
cflags = sysconfig.get_config_vars('CFLAGS')[0]
|
|
archs = re.findall(r'-arch\s+(\w+)', cflags)
|
|
|
|
- tmpfile = os.path.join(self.build_temp, 'tk.arch')
|
|
+ tmpfile = os.path.join(self.build_temp, 'tk.arch').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
|
|
# Note: cannot use os.popen or subprocess here, that
|
|
# requires extensions that are not available here.
|
|
if is_macosx_sdk_path(F):
|
|
- os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(os.path.join(sysroot, F[1:]), tmpfile))
|
|
+ os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(os.path.join(sysroot, F[1:]).replace('\\','/'), tmpfile))
|
|
else:
|
|
- os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(F, tmpfile))
|
|
+ os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(F.replace('\\','/'), tmpfile))
|
|
|
|
with open(tmpfile) as fp:
|
|
detected_archs = []
|