| |
@@ -1,48 +0,0 @@
|
| |
- From ee6c6f1ba7496f22036e4b0c1af7cd737d246efe Mon Sep 17 00:00:00 2001
|
| |
- From: Bohuslav Kabrda <bkabrda@redhat.com>
|
| |
- Date: Fri, 19 Jun 2020 16:11:14 +0200
|
| |
- Subject: [PATCH] 00178: Don't duplicate various FLAGS in sysconfig values
|
| |
-
|
| |
- http://bugs.python.org/issue17679
|
| |
-
|
| |
- Co-Authored-By: Bohuslav Kabrda <bkabrda@redhat.com>
|
| |
- ---
|
| |
- Lib/distutils/sysconfig.py | 5 ++++-
|
| |
- Lib/sysconfig.py | 5 ++++-
|
| |
- 2 files changed, 8 insertions(+), 2 deletions(-)
|
| |
-
|
| |
- diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
|
| |
- index 3ce0dc1645..acf223dd16 100644
|
| |
- --- a/Lib/distutils/sysconfig.py
|
| |
- +++ b/Lib/distutils/sysconfig.py
|
| |
- @@ -374,7 +374,10 @@ def parse_makefile(fn, g=None):
|
| |
- done[n] = item = ""
|
| |
- if found:
|
| |
- after = value[m.end():]
|
| |
- - value = value[:m.start()] + item + after
|
| |
- + value = value[:m.start()]
|
| |
- + if item.strip() not in value:
|
| |
- + value += item
|
| |
- + value += after
|
| |
- if "$" in after:
|
| |
- notdone[name] = value
|
| |
- else:
|
| |
- diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
| |
- index 159c78bb99..a1096c6951 100644
|
| |
- --- a/Lib/sysconfig.py
|
| |
- +++ b/Lib/sysconfig.py
|
| |
- @@ -295,7 +295,10 @@ def _parse_makefile(filename, vars=None):
|
| |
-
|
| |
- if found:
|
| |
- after = value[m.end():]
|
| |
- - value = value[:m.start()] + item + after
|
| |
- + value = value[:m.start()]
|
| |
- + if item.strip() not in value:
|
| |
- + value += item
|
| |
- + value += after
|
| |
- if "$" in after:
|
| |
- notdone[name] = value
|
| |
- else:
|
| |
- --
|
| |
- 2.26.2
|
| |
-
|
| |
Remove downstream 00178-dont-duplicate-flags-in-sysconfig.patch which
introduced a bug on distutils.sysconfig.get_config_var('LIBPL').
Resolves: rhbz#1851008