This repository was archived by the owner on Feb 1, 2023. It is now read-only.
Commit f38d467
Release Manager
Trac #31584: Fix suitesparse/cvxopt /usr/local leakage
We fix a simple bug in our build system:
The value of `SAGE_SUITESPARSE_LOCALINSTALL` is set in
`build/pkgs/suitesparse/spkg-configure.m4` but is not actually passed on
to `build/pkgs/cvxopt/spkg-install.in`. A different variable,
`SAGE_SUITESPARSE_PREFIX`, is passed by `build/bin/sage-build-env-
config.in` from the configure stage to the build stage, but it is never
set or used.
{{{
$ git grep SAGE_SUITESPARSE
build/bin/sage-build-env-config.in:export
SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
build/pkgs/cvxopt/spkg-install.in:if test
"x$SAGE_SUITESPARSE_LOCALINSTALL" != "x"; then
build/pkgs/suitesparse/spkg-configure.m4:
AC_SUBST(SAGE_SUITESPARSE_LOCALINSTALL, ['$SAGE_LOCAL'])
build/pkgs/suitesparse/spkg-configure.m4:
AC_SUBST(SAGE_SUITESPARSE_LOCALINSTALL, [''])
}}}
As a result, `suitesparse` from `/usr/local` can leak in, as observed in
https://trac.sagemath.org/ticket/31567?replyto=25#comment:25
Clearly these two variables were intended to be the same variable. We
fix this. This unified variable, `SAGE_SUITESPARSE_PREFIX`, is
analogous to other variables `SAGE_..._PREFIX`.
URL: https://trac.sagemath.org/31584
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe
Reviewer(s): Michael OrlitzkyFile tree
4 files changed
+9
-9
lines changed- build/pkgs
- configure
- cvxopt
- suitesparse
4 files changed
+9
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
4 | | - | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
69 | | - | |
70 | | - | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
0 commit comments