diff --git a/build/pkgs/meson/spkg-configure.m4 b/build/pkgs/meson/spkg-configure.m4 index 7ebfa601644..1dd9935816a 100644 --- a/build/pkgs/meson/spkg-configure.m4 +++ b/build/pkgs/meson/spkg-configure.m4 @@ -1,8 +1,6 @@ SAGE_SPKG_CONFIGURE([meson], [dnl - dnl scipy 1.11.2 needs meson >= 1.1.0 - dnl contourpy needs meson >= 1.2.0 - dnl meson_python needs meson >= 1.2.3 for Python >= 3.12 - AC_CACHE_CHECK([for meson >= 1.2.3], [ac_cv_path_MESON], [dnl + dnl scipy 1.15.2 needs meson >= 1.5.0 + AC_CACHE_CHECK([for meson >= 1.5.0], [ac_cv_path_MESON], [dnl dnl Do not accept meson installed in the default user scheme; dnl it will not work in our venv because we set PYTHONUSERBASE dnl in sage-env. @@ -10,7 +8,7 @@ SAGE_SPKG_CONFIGURE([meson], [dnl AC_PATH_PROGS_FEATURE_CHECK([MESON], [meson], [dnl AS_IF([meson_version=$($ac_path_MESON --version 2>&1)], [dnl AS_IF([test -n "$meson_version"], [dnl - AX_COMPARE_VERSION([$meson_version], [ge], [1.2.3], [dnl + AX_COMPARE_VERSION([$meson_version], [ge], [1.5.0], [dnl ac_cv_path_MESON="$ac_path_MESON" ac_path_MESON_found=: ]) diff --git a/build/pkgs/meson/version_requirements.txt b/build/pkgs/meson/version_requirements.txt index 0b9952eaa15..6026d02b4af 100644 --- a/build/pkgs/meson/version_requirements.txt +++ b/build/pkgs/meson/version_requirements.txt @@ -1 +1 @@ -meson +meson >= 1.5.0