Skip to content

Commit

Permalink
Update shell uses of 'sage-package properties'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koeppe committed Feb 16, 2024
1 parent 65f0085 commit da3cddf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cd "$SAGE_ROOT"

export PATH="$SAGE_ROOT/build/bin:$PATH"

eval $(sage-package properties configure)
eval $(sage-package properties --format=shell configure)
PKG=$path_configure
MAKE="${MAKE:-make}"
CONFVERSION=$version_configure
Expand All @@ -46,7 +46,7 @@ bootstrap () {
for a in m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
echo 'changequote(`>>>'"'"', `<<<'"')dnl" >> $a
done
eval $(sage-package properties :all:)
eval $(sage-package properties --format=shell :all:)
spkg_configures=""
# initialize SAGE_ENABLE... options for standard packages
for pkgname in $(sage-package list :standard:); do
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-conda
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SAGELIB_PACKAGES=
SAGELIB_OPTIONAL_PACKAGES=
DEVELOP_PACKAGES=

eval $(sage-package properties :all:)
eval $(sage-package properties --format=shell :all:)

for PKG_BASE in $(sage-package list --has-file distros/conda.txt --exclude _sagemath); do
eval PKG_SCRIPTS=\$path_$PKG_BASE PKG_TYPE=\$type_$PKG_BASE
Expand Down
2 changes: 1 addition & 1 deletion m4/sage_spkg_collect.m4
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ AC_DEFUN([SAGE_SPKG_COLLECT_INIT], [
dnl Intialize the collection variables.
SPKGS="$1"
dnl Obtain dependencies and versions at configure time.
AS_IF([eval $($SAGE_BOOTSTRAP_PYTHON build/bin/sage-package dependencies --format=shell $SPKGS) && eval $($SAGE_BOOTSTRAP_PYTHON build/bin/sage-package properties $SPKGS)], [], [
AS_IF([eval $($SAGE_BOOTSTRAP_PYTHON build/bin/sage-package dependencies --format=shell $SPKGS) && eval $($SAGE_BOOTSTRAP_PYTHON build/bin/sage-package properties --format=shell $SPKGS)], [], [
AC_MSG_ERROR([Package directory missing. Re-run bootstrap.])dnl
])
Expand Down

0 comments on commit da3cddf

Please sign in to comment.