Skip to content

Tools/jit/_llvm.py doesn't support LLVM_VERSION_SUFFIX #120602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
xarblu opened this issue Jun 16, 2024 · 2 comments
Closed

Tools/jit/_llvm.py doesn't support LLVM_VERSION_SUFFIX #120602

xarblu opened this issue Jun 16, 2024 · 2 comments
Labels
build The build process and cross-build topic-JIT type-bug An unexpected behavior, bug, or error

Comments

@xarblu
Copy link
Contributor

xarblu commented Jun 16, 2024 •
edited by bedevere-app bot
Loading

Bug report

Bug description:

I initially encountered this build issue on Gentoo.

Currently the regex in Tools/jit/_llvm.py only allows strings of the form version MAJOR.MINOR.PATCH

_LLVM_VERSION_PATTERN = re.compile(rf"version\s+{_LLVM_VERSION}\.\d+\.\d+\s+")

However if LLVM was built with e.g. -DLLVM_VERSION_SUFFIX=+libcxx (as is the case on Gentoo) clang --version would return clang version 18.1.7+libcxx which is a valid version but doesn't match.

My proposed fix would be to simply allow a non-whitespace string of arbitrary length after the version, i.e.:

_LLVM_VERSION_PATTERN = re.compile(rf"version\s+{_LLVM_VERSION}\.\d+\.\d+\S*\s+")

CPython versions tested on:

3.13

Operating systems tested on:

Linux

Linked PRs
@xarblu xarblu added the type-bug An unexpected behavior, bug, or error label Jun 16, 2024
@Eclips4 Eclips4 added build The build process and cross-build topic-JIT labels Jun 16, 2024
@Eclips4
Copy link
Member

Eclips4 commented Jun 16, 2024

Hello!
Would you like to send a PR? 🙂

xarblu added a commit to xarblu/cpython that referenced this issue Jun 16, 2024
@xarblu
pythongh-120602: Support LLVM_VERSION_SUFFIX
69e43a9
@xarblu
Copy link
Contributor Author

xarblu commented Jun 16, 2024

Yes, I'm in the process of sending it. Just following the contribution guidelines and made the issue first :)

@xarblu xarblu mentioned this issue Jun 16, 2024
Merged
xarblu added a commit to xarblu/cpython that referenced this issue Jun 19, 2024
@xarblu
pythongh-120602: Support LLVM_VERSION_SUFFIX
6c68903
brandtbucher pushed a commit that referenced this issue Jun 20, 2024
@xarblu
GH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (GH-120604)
285f42c
miss-islington pushed a commit to miss-islington/cpython that referenced this issue Jun 20, 2024
@xarblu @miss-islington
pythonGH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (pythonGH…
84cbf60 
…-120604)

(cherry picked from commit 285f42c)

Co-authored-by: Xarblu <[email protected]>
@bedevere-app bedevere-app bot mentioned this issue Jun 20, 2024
Merged
brandtbucher pushed a commit that referenced this issue Jun 20, 2024
@miss-islington @xarblu
[3.13] GH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (GH-120768)
6b714d5 
(cherry picked from commit 285f42c)

Co-authored-by: Xarblu <[email protected]>
mrahtz pushed a commit to mrahtz/cpython that referenced this issue Jun 30, 2024
@xarblu @mrahtz
pythonGH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (pythonGH…
24b8cbb 
…-120604)
noahbkim pushed a commit to hudson-trading/cpython that referenced this issue Jul 11, 2024
@xarblu @noahbkim
pythonGH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (pythonGH…
48e364c 
…-120604)
estyxx pushed a commit to estyxx/cpython that referenced this issue Jul 17, 2024
@xarblu @estyxx
pythonGH-120602: Support LLVM_VERSION_SUFFIX for JIT builds (pythonGH…
05290cc 
…-120604)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
build The build process and cross-build topic-JIT type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@brandtbucher @Eclips4 @xarblu