Skip to content
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.

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

build/pkgs/ninja_build: support samurai version scheme #36955

Merged
merged 1 commit into from
Dec 26, 2023

Conversation

orlitzky
Copy link
Contributor

Samurai is a C99 ninja implementation with an almost-compatible version scheme, except that it has only two version components instead of the three that ninja has. We update the "sed" call used to parse the version number out of ninja --version so that it can parse a samurai version too.

This should only matter on systems where (for example) /usr/bin/ninja points to samurai. That's not typical, but it recently became possible to do on Gentoo in an "official" way.

Samurai is a C99 ninja implementation with an almost-compatible
version scheme, except that it has only two version components
instead of the three that ninja has. We update the "sed" call
used to parse the version number out of `ninja --version` so
that it can parse a samurai version too.

This should only matter on systems where (for example) /usr/bin/ninja
points to samurai. That's not typical, but it recently became possible
to do on Gentoo in an "official" way.
@orlitzky
Copy link
Contributor Author

I've been abusing the ac_cv cache variable to do this for a long time, but now app-alternatives/ninja exists to manage the /usr/bin/ninja symlink.

Copy link

Documentation preview for this PR (built with commit 5413732; changes) is ready! 🎉

Copy link
Member

@mkoeppe mkoeppe left a comment

Choose a reason for hiding this comment

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

LGTM

vbraun pushed a commit to vbraun/sage that referenced this pull request Dec 24, 2023
Samurai is a C99 ninja implementation with an almost-compatible version
scheme, except that it has only two version components instead of the
three that ninja has. We update the "sed" call used to parse the version
number out of `ninja --version` so that it can parse a samurai version
too.

This should only matter on systems where (for example) /usr/bin/ninja
points to samurai. That's not typical, but it recently became possible
to do on Gentoo in an "official" way.

URL: sagemath#36955
Reported by: Michael Orlitzky
Reviewer(s): Matthias Köppe
@vbraun vbraun merged commit e95536c into sagemath:develop Dec 26, 2023
34 of 53 checks passed
@mkoeppe mkoeppe added this to the sage-10.3 milestone Dec 26, 2023
@orlitzky orlitzky deleted the samu branch January 24, 2024 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants