diff options
| author | Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> | 2022-09-14 20:45:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-14 12:45:41 -0600 |
| commit | ebb20eb8f8fcd2cf01fc127e82759e7050f4b074 (patch) | |
| tree | 3f989d84d18043ac4894941b17a56a48d0d8c310 | |
| parent | 045a5e80cb546b08d89cf53914a7c67c5aa25665 (diff) | |
| download | spack-ebb20eb8f8fcd2cf01fc127e82759e7050f4b074.tar.gz spack-ebb20eb8f8fcd2cf01fc127e82759e7050f4b074.tar.bz2 spack-ebb20eb8f8fcd2cf01fc127e82759e7050f4b074.tar.xz spack-ebb20eb8f8fcd2cf01fc127e82759e7050f4b074.zip | |
llvm: fix detection of LLDB_PYTHON_EXE_RELATIVE_PATH (#32584)
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/D133513.diff | 29 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 6 |
2 files changed, 35 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/D133513.diff b/var/spack/repos/builtin/packages/llvm/D133513.diff new file mode 100644 index 0000000000..54849b8e85 --- /dev/null +++ b/var/spack/repos/builtin/packages/llvm/D133513.diff @@ -0,0 +1,29 @@ +Index: lldb/bindings/python/get-python-config.py +=================================================================== +--- lldb/bindings/python/get-python-config.py ++++ lldb/bindings/python/get-python-config.py +@@ -44,15 +44,21 @@ + elif args.variable_name == "LLDB_PYTHON_EXE_RELATIVE_PATH": + tried = list() + exe = sys.executable +- prefix = os.path.realpath(sys.prefix) ++ prefix = sys.prefix + while True: + try: + print(relpath_nodots(exe, prefix)) + break + except ValueError: + tried.append(exe) +- if os.path.islink(exe): +- exe = os.path.join(os.path.realpath(os.path.dirname(exe)), os.readlink(exe)) ++ real_exe_dirname = os.path.realpath(os.path.dirname(exe)) ++ real_prefix = os.path.realpath(prefix) ++ if prefix != real_prefix: ++ prefix = real_prefix ++ exe = os.path.join(real_exe_dirname, os.path.basename(exe)) ++ continue ++ elif os.path.islink(exe): ++ exe = os.path.join(real_exe_dirname, os.readlink(exe)) + continue + else: + print("Could not find a relative path to sys.executable under sys.prefix", file=sys.stderr) diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index ff23d4ff75..cff8f2e758 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -377,6 +377,12 @@ class Llvm(CMakePackage, CudaPackage): when="@8:11", ) + # fix detection of LLDB_PYTHON_EXE_RELATIVE_PATH + # see https://reviews.llvm.org/D133513 + # TODO: adjust version constraint and switch to fetching from the upstream GitHub repo + # when/if the bugfix is merged + patch("D133513.diff", level=0, when="@14:15+lldb+python") + # The functions and attributes below implement external package # detection for LLVM. See: # |