Skip to content

Commit 07e6461

Browse files
committed
bump up external meson's minimal version for scipy
1 parent 052acf6 commit 07e6461

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

build/pkgs/meson/spkg-configure.m4

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
SAGE_SPKG_CONFIGURE([meson], [dnl
2-
dnl scipy 1.11.2 needs meson >= 1.1.0
3-
dnl contourpy needs meson >= 1.2.0
4-
dnl meson_python needs meson >= 1.2.3 for Python >= 3.12
5-
AC_CACHE_CHECK([for meson >= 1.2.3], [ac_cv_path_MESON], [dnl
2+
dnl scipy 1.15.2 needs meson >= 1.5.0
3+
AC_CACHE_CHECK([for meson >= 1.5.0], [ac_cv_path_MESON], [dnl
64
dnl Do not accept meson installed in the default user scheme;
75
dnl it will not work in our venv because we set PYTHONUSERBASE
86
dnl in sage-env.
97
WITH_SAGE_PYTHONUSERBASE([dnl
108
AC_PATH_PROGS_FEATURE_CHECK([MESON], [meson], [dnl
119
AS_IF([meson_version=$($ac_path_MESON --version 2>&1)], [dnl
1210
AS_IF([test -n "$meson_version"], [dnl
13-
AX_COMPARE_VERSION([$meson_version], [ge], [1.2.3], [dnl
11+
AX_COMPARE_VERSION([$meson_version], [ge], [1.5.0], [dnl
1412
ac_cv_path_MESON="$ac_path_MESON"
1513
ac_path_MESON_found=:
1614
])
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
meson
1+
meson >= 1.5.0

0 commit comments

Comments
 (0)