Skip to content

Commit 5413732

Browse files
committed
build/pkgs/ninja_build: support samurai version scheme
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.
1 parent b002b63 commit 5413732

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

build/pkgs/ninja_build/spkg-configure.m4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ SAGE_SPKG_CONFIGURE(
33
dnl meson_python needs 1.8.2 or later
44
AC_CACHE_CHECK([for ninja >= 1.8.2], [ac_cv_path_NINJA], [
55
AC_PATH_PROGS_FEATURE_CHECK([NINJA], [ninja], [
6+
dnl support both two- and three-component version schemes
7+
dnl since samurai (a ninja alternative) uses two
68
ninja_version=`$ac_path_NINJA --version 2>&1 \
7-
| $SED -n -e 's/\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\).*/\1/p'`
9+
| $SED -n -e 's/\([[0-9]]*\(\.[[0-9]]*\)\{1,2\}\).*/\1/p'`
810
AS_IF([test -n "$ninja_version"], [
911
AX_COMPARE_VERSION([$ninja_version], [ge], [1.8.2], [
1012
ac_cv_path_NINJA="$ac_path_NINJA"

0 commit comments

Comments
 (0)