Skip to content

Commit

Permalink
Trac #32992: update ninja_build to 1.11.0, make it standard, add lowe…
Browse files Browse the repository at this point in the history
…r version bound

This is preparation for scipy 1.9.0 (#34081), which switched to the
meson toolchain.

URL: https://trac.sagemath.org/32992
Reported by: dimpase
Ticket author(s): Matthias Koeppe
Reviewer(s): Dima Pasechnik
  • Loading branch information
Release Manager committed Aug 28, 2022
2 parents 1c178e0 + 66af9c2 commit 75d9213
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
7 changes: 4 additions & 3 deletions build/pkgs/ninja_build/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
tarball=ninja_build-VERSION.tar.gz
sha1=17219deb34dd816363e37470f77ff7231509143a
md5=5fdb04461cc7f5d02536b3bfc0300166
cksum=28253504
sha1=f8c9279bdd4efc63b1a6be3b8c5a5031699af9ac
md5=7d1a1a2f5cdc06795b3054df5c17d5ef
cksum=3142198237
upstream_url=https://github.com/ninja-build/ninja/archive/refs/tags/vVERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/ninja_build/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8.2
1.11.0
5 changes: 3 additions & 2 deletions build/pkgs/ninja_build/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
SAGE_SPKG_CONFIGURE(
[ninja_build], [
AC_CACHE_CHECK([for ninja >= 1.7.2], [ac_cv_path_NINJA], [
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], [
ninja_version=`$ac_path_NINJA --version 2>&1 \
| $SED -n -e 's/\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\).*/\1/p'`
AS_IF([test -n "$ninja_version"], [
AX_COMPARE_VERSION([$ninja_version], [ge], [1.7.2], [
AX_COMPARE_VERSION([$ninja_version], [ge], [1.8.2], [
ac_cv_path_NINJA="$ac_path_NINJA"
ac_path_NINJA_found=:
])
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/ninja_build/type
Original file line number Diff line number Diff line change
@@ -1 +1 @@
optional
standard

0 comments on commit 75d9213

Please sign in to comment.