Skip to content

Commit

Permalink
m4/sage_spkg_collect.m4: Fix handling of missing package dirs (test: …
Browse files Browse the repository at this point in the history
…'./bootstrap && rm -rf build/pkgs/cachetools; ./configure')
  • Loading branch information
Matthias Koeppe committed Feb 25, 2024
1 parent 11d8401 commit 8c003e0
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions m4/sage_spkg_collect.m4
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,12 @@ m4_include([m4/sage_spkg_configures.m4])

dnl ==========================================================================
AC_DEFUN([SAGE_SPKG_COLLECT_INIT], [
AS_BOX([Build status for each package: ]) >& AS_MESSAGE_FD
AS_BOX([Build status for each package: ]) >& AS_MESSAGE_LOG_FD
dnl Intialize the collection variables.
SPKGS="$1"
dnl Obtain versions at configure time.
AS_IF([eval $($SAGE_BOOTSTRAP_PYTHON build/bin/sage-package properties --format=shell $SPKGS)], [], [
AS_IF([properties=$($SAGE_BOOTSTRAP_PYTHON build/bin/sage-package properties --format=shell $SPKGS 2>& AS_MESSAGE_LOG_FD) && eval $properties], [], [
AC_MSG_ERROR([Package directory missing. Re-run bootstrap.])dnl
])
Expand All @@ -92,9 +94,6 @@ else
fi
AC_SUBST([SAGE_GCC_DEP])
AS_BOX([Build status for each package: ]) >& AS_MESSAGE_FD
AS_BOX([Build status for each package: ]) >& AS_MESSAGE_LOG_FD
# Packages that are actually built/installed as opposed to packages that are
# not required on this platform or that can be taken from the underlying system
# installation. Note that this contains packages that are not actually going to
Expand Down

0 comments on commit 8c003e0

Please sign in to comment.