diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index bdd96db7026..95c3f6a1338 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=2389d2b093493c568deda190ffc326ff2b835169 -md5=545e80b50deb4efa46f14d0a543ba98f -cksum=169905223 +sha1=9efe8fb5bde503598ca8fa9c88c8264142a629e0 +md5=7cb1bc053cc00a1f91a0d46b90ab487a +cksum=3260934064 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 033bf42aaae..de50cc1e901 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -73e52a419812253c3c3ce72bab7f1a5ddf4c0461 +706e0de188dd8706317e5bc5175db4ea19ebc22f diff --git a/build/pkgs/ninja_build/spkg-configure.m4 b/build/pkgs/ninja_build/spkg-configure.m4 index fb6c4f00985..5b83d189801 100644 --- a/build/pkgs/ninja_build/spkg-configure.m4 +++ b/build/pkgs/ninja_build/spkg-configure.m4 @@ -3,8 +3,10 @@ SAGE_SPKG_CONFIGURE( dnl meson_python needs 1.8.2 or later AC_CACHE_CHECK([for ninja >= 1.8.2], [ac_cv_path_NINJA], [ AC_PATH_PROGS_FEATURE_CHECK([NINJA], [ninja], [ + dnl support both two- and three-component version schemes + dnl since samurai (a ninja alternative) uses two ninja_version=`$ac_path_NINJA --version 2>&1 \ - | $SED -n -e 's/\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\).*/\1/p'` + | $SED -n -e 's/\([[0-9]]*\(\.[[0-9]]*\)\{1,2\}\).*/\1/p'` AS_IF([test -n "$ninja_version"], [ AX_COMPARE_VERSION([$ninja_version], [ge], [1.8.2], [ ac_cv_path_NINJA="$ac_path_NINJA"