rebase of the patch

This commit is contained in:
Sylvestre Ledru 2023-09-12 13:18:50 +02:00
parent 221deb828f
commit 2b44ee3a5e

View File

@ -1,19 +1,19 @@
Author: Gianfranco Costamagna <locutusofborg@debian.org> Author: Gianfranco Costamagna <locutusofborg@debian.org>
Last-Update: 2023-01-19 Last-Update: 2023-01-19
Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/python/get-python-config.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/bindings/python/get-python-config.py --- llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79.orig/lldb/bindings/python/get-python-config.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py +++ llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/python/get-python-config.py
@@ -15,6 +15,7 @@ def relpath_nodots(path, base): @@ -16,6 +16,7 @@ def relpath_nodots(path, base):
return rel
def main(): def main():
+ import sysconfig + import sysconfig
parser = argparse.ArgumentParser(description="extract cmake variables from python") parser = argparse.ArgumentParser(description="extract cmake variables from python")
parser.add_argument("variable_name") parser.add_argument("variable_name")
args = parser.parse_args() args = parser.parse_args()
@@ -31,7 +32,19 @@ def main(): @@ -32,7 +33,19 @@ def main():
# If not, you'll have to use lldb -P or lldb -print-script-interpreter-info # If not, you'll have to use lldb -P or lldb -print-script-interpreter-info
# to figure out where it is. # to figure out where it is.
try: try:
@ -34,10 +34,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/py
except ValueError: except ValueError:
# Try to fall back to something reasonable if sysconfig's platlib # Try to fall back to something reasonable if sysconfig's platlib
# is outside of sys.prefix # is outside of sys.prefix
Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp --- llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -240,6 +240,7 @@ void ScriptInterpreterPython::ComputePyt @@ -240,6 +240,7 @@ void ScriptInterpreterPython::ComputePyt
// the real python interpreter uses. (e.g. lib for most, lib64 on RHEL // the real python interpreter uses. (e.g. lib for most, lib64 on RHEL
// x86_64, or bin on Windows). // x86_64, or bin on Windows).