mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-02 16:07:42 +00:00
python: re-add patch mistakenly removed
As noticed by André Hentschel <nerv@dawncrow.de>, commit 652076293235276e2f978fe377322a6cbd615455 ("python: move to Git formatted patches") mistakenly removed 018-fix-add-gcc-paths-logic.patch. This causes bug #7971 to re-appear. To fix this, we re-introduce the missing patch. Reported-by: André Hentschel <nerv@dawncrow.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
844a7c6281
commit
1f349933ba
@ -0,0 +1,37 @@
|
|||||||
|
From d2bfa8805206db8c57c182094396d20a9d94bd8f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Samuel Cabrero <samuelcabrero@gmail.com>
|
||||||
|
Date: Sat, 1 Apr 2017 09:31:52 +0200
|
||||||
|
Subject: [PATCH] Override system locale and set to default when adding gcc
|
||||||
|
paths
|
||||||
|
|
||||||
|
Forces the use of the default locale in the function
|
||||||
|
add_gcc_paths, which is called when cross compiling to add the
|
||||||
|
include and library paths. This is necessary because otherwise
|
||||||
|
the gcc output is localized and the output parsing fails, which
|
||||||
|
results in no paths added and detect_modules not able to find
|
||||||
|
any system library (eg. libz, libssl, etc.)
|
||||||
|
|
||||||
|
[Thomas: patch taken from https://bugs.python.org/issue23767.]
|
||||||
|
|
||||||
|
Signed-off-by: Samuel Cabrero <samuelcabrero@gmail.com>
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
---
|
||||||
|
setup.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/setup.py b/setup.py
|
||||||
|
index 8045a9b..c14f4ab 100644
|
||||||
|
--- a/setup.py
|
||||||
|
+++ b/setup.py
|
||||||
|
@@ -430,7 +430,7 @@ class PyBuildExt(build_ext):
|
||||||
|
tmpfile = os.path.join(self.build_temp, 'gccpaths')
|
||||||
|
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))
|
||||||
|
+ ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
|
||||||
|
is_gcc = False
|
||||||
|
in_incdirs = False
|
||||||
|
inc_dirs = []
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user