Skip to content

Cherry-pick Elbrus2000-related fixes from upstream#26

Open
arrowd wants to merge 4 commits into
numpy:main-numpymesonfrom
arrowd:e2k-numpy
Open

Cherry-pick Elbrus2000-related fixes from upstream#26
arrowd wants to merge 4 commits into
numpy:main-numpymesonfrom
arrowd:e2k-numpy

Conversation

@arrowd

@arrowd arrowd commented Jun 3, 2026

Copy link
Copy Markdown

No description provided.

Fix commit d37d649, which broke Elbrus support:

   File "/usr/lib/python3/site-packages/mesonbuild/compilers/cpp.py", line 641, in get_option_compile_args
     assert isinstance(debugstl, str)

(cherry picked from commit d435758)
return ['-fopenmp']

@classmethod
def use_linker_args(cls, linker: str, version: str) -> T.List[str]:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR. I assume this is the change you actually need? The version_compare changes don't look relevant to building numpy.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just grabbed all changes related to e2k from git log. Would you like me te remove version_compare ones from the PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries, I just wanted to make sure - you can leave the PR as is. I'm on holiday now, but will try to integrte this when I'm back.

@arrowd

arrowd commented Jun 10, 2026

Copy link
Copy Markdown
Author

Converting to draft while waiting for upstream PR mesonbuild#15917
Once it lands, I will cherry-pick it into this one and then it'd be good to go.

e2k's gfortran mimics the GNU one in this regard. Fixes numpy's f2py tests.

(cherry picked from commit 3eaf128)
@arrowd arrowd marked this pull request as ready for review June 11, 2026 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants