72 lines
3.1 KiB
Diff
72 lines
3.1 KiB
Diff
From 9cb9e760a7efae433e1fb838210fd3389e119527 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
|
|
<alexey.pawlow@gmail.com>
|
|
Date: Thu, 17 Jun 2021 18:51:58 +0530
|
|
Subject: [PATCH 045/N] msys replace slashes used in io redirection
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Co-authored-by: Алексей <alexey.pawlow@gmail.com>
|
|
Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Co-authored-by: Naveen M K <naveen521kk@gmail.com>
|
|
---
|
|
setup.py | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index b3c5d75..4fd3c1a 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -680,7 +680,7 @@ class PyBuildExt(build_ext):
|
|
def add_multiarch_paths(self):
|
|
# Debian/Ubuntu multiarch support.
|
|
# https://wiki.ubuntu.com/MultiarchSpec
|
|
- 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(
|
|
@@ -705,7 +705,7 @@ class PyBuildExt(build_ext):
|
|
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(
|
|
@@ -767,7 +767,7 @@ class PyBuildExt(build_ext):
|
|
pass
|
|
|
|
def add_cross_compiling_paths(self):
|
|
- 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)
|
|
# bpo-38472: With a German locale, GCC returns "gcc-Version 9.1.0
|
|
@@ -1103,7 +1103,7 @@ class PyBuildExt(build_ext):
|
|
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.
|
|
@@ -2126,12 +2126,12 @@ class PyBuildExt(build_ext):
|
|
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 = []
|