ce81a6e6d2
Drop 0030-Fix-cross-compiling-the-uuid-module.patch as the patched code has been reworked upstream and python3 is built with --disable-uuid:91a51c5ffc
Rework 0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch as the MULTIARCH code is now conditional on !darwin:9901d153c2
Refresh and renumber remaining patches. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 64bdc89106e6bd76e9b204d9cfef0adb7bfb0f4a Mon Sep 17 00:00:00 2001
|
|
From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
|
|
Date: Wed, 23 Dec 2015 11:44:30 +0100
|
|
Subject: [PATCH] Do not adjust the shebang of Python scripts for
|
|
cross-compilation
|
|
|
|
The copy_scripts() method in distutils copies the scripts listed in
|
|
the setup file and adjusts the first line to refer to the current
|
|
Python interpreter. When cross-compiling, this means that the adjusted
|
|
shebang refers to the host Python interpreter.
|
|
|
|
This patch modifies copy_scripts() to preserve the shebang when
|
|
cross-compilation is detected.
|
|
|
|
Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
|
|
---
|
|
Lib/distutils/command/build_scripts.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
|
|
index ccc70e6465..d6d54195c1 100644
|
|
--- a/Lib/distutils/command/build_scripts.py
|
|
+++ b/Lib/distutils/command/build_scripts.py
|
|
@@ -91,7 +91,7 @@ class build_scripts(Command):
|
|
adjust = True
|
|
post_interp = match.group(1) or b''
|
|
|
|
- if adjust:
|
|
+ if adjust and not '_python_sysroot' in os.environ:
|
|
log.info("copying and adjusting %s -> %s", script,
|
|
self.build_dir)
|
|
updated_files.append(outfile)
|
|
--
|
|
2.20.1
|
|
|