Skip to content

Commit 3212ffe

Browse files
author
Matthias Koeppe
committed
build/pkgs/meson/spkg-configure.m4: Reject meson from inaccessible user scheme
1 parent 4d69c5c commit 3212ffe

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

build/pkgs/meson/spkg-configure.m4

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
SAGE_SPKG_CONFIGURE(
2-
[meson], [
3-
dnl scipy 1.11.2 needs meson >= 1.1.0
4-
dnl contourpy needs meson >= 1.2.0
5-
dnl meson_python needs meson >= 1.2.3 for Python >= 3.12
6-
AC_CACHE_CHECK([for meson >= 1.2.3], [ac_cv_path_MESON], [
7-
AC_PATH_PROGS_FEATURE_CHECK([MESON], [meson], [
8-
meson_version=`$ac_path_MESON --version 2>&1`
9-
AS_IF([test -n "$meson_version"], [
10-
AX_COMPARE_VERSION([$meson_version], [ge], [1.2.3], [
11-
ac_cv_path_MESON="$ac_path_MESON"
12-
ac_path_MESON_found=:
1+
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
6+
dnl Do not accept meson installed in the default user scheme;
7+
dnl it will not work in our venv because we set PYTHONUSERBASE
8+
dnl in sage-env.
9+
WITH_SAGE_PYTHONUSERBASE([dnl
10+
AC_PATH_PROGS_FEATURE_CHECK([MESON], [meson], [dnl
11+
AS_IF([meson_version=$($ac_path_MESON --version 2>&1)], [dnl
12+
AS_IF([test -n "$meson_version"], [dnl
13+
AX_COMPARE_VERSION([$meson_version], [ge], [1.2.3], [dnl
14+
ac_cv_path_MESON="$ac_path_MESON"
15+
ac_path_MESON_found=:
16+
])
17+
])
1318
])
1419
])
1520
])

0 commit comments

Comments
 (0)