55 lines
2.5 KiB
Diff
55 lines
2.5 KiB
Diff
diff -Naur Python-3.9.4-orig/setup.py Python-3.9.4/setup.py
|
|
--- Python-3.9.4-orig/setup.py 2021-04-04 08:56:53 +0000
|
|
+++ Python-3.9.4/setup.py 2021-04-05 21:28:28 +0000
|
|
@@ -629,7 +629,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 = run_command(
|
|
@@ -654,7 +654,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 = run_command(
|
|
@@ -673,7 +673,7 @@
|
|
|
|
def add_cross_compiling_paths(self):
|
|
cc = sysconfig.get_config_var('CC')
|
|
- tmpfile = os.path.join(self.build_temp, 'ccpaths')
|
|
+ tmpfile = os.path.join(self.build_temp, 'ccpaths').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
ret = run_command('%s -E -v - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile))
|
|
@@ -967,7 +967,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.
|
|
@@ -1931,12 +1931,12 @@
|
|
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)
|
|
|
|
run_command(
|
|
- "file {}/Tk.framework/Tk | grep 'for architecture' > {}".format(F, tmpfile)
|
|
+ "file {}/Tk.framework/Tk | grep 'for architecture' > {}".format(F, tmpfile).replace('\\','/')
|
|
)
|
|
with open(tmpfile) as fp:
|
|
detected_archs = []
|