From 37aad3c3e65824284889d3a2f010b67c27f5b64e Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 15 Dec 2023 21:18:39 -0800
Subject: [PATCH] bootstrap, m4/sage_spkg_collect.m4: Get dependencies via
 'sage --package dependencies --format=shell'

---
 bootstrap               |  6 +++++-
 m4/sage_spkg_collect.m4 | 43 +++++++++++------------------------------
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/bootstrap b/bootstrap
index 5070b5df44a..6760f2c96a6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -86,7 +86,11 @@ $config"
 $spkg_configures
 $spkg_configures_python
 EOF
-    for pkgname in $(sage-package list); do
+    SPKGS=$(sage-package list)
+    cat >> m4/sage_spkg_configures.m4 <<EOF
+SAGE_SPKG_COLLECT_INIT([$(echo $SPKGS)])
+EOF
+    for pkgname in $SPKGS; do
         DIR=build/pkgs/$pkgname
         pkgtype="$(cat $DIR/type)"
         if test -f "$DIR/requirements.txt"; then
diff --git a/m4/sage_spkg_collect.m4 b/m4/sage_spkg_collect.m4
index c1b781e8811..57075257f19 100644
--- a/m4/sage_spkg_collect.m4
+++ b/m4/sage_spkg_collect.m4
@@ -76,6 +76,9 @@ m4_include([m4/sage_spkg_configures.m4])
 dnl ==========================================================================
 AC_DEFUN([SAGE_SPKG_COLLECT_INIT], [
 dnl Intialize the collection variables.
+m4_pushdef([SPKG_NAMES], [$1])dnl
+dnl Obtain dependencies at configure time.
+eval $($SAGE_BOOTSTRAP_PYTHON build/bin/sage-package dependencies --format=shell ]SPKG_NAMES[)
 # To deal with ABI incompatibilities when gcc is upgraded, every package
 # (except gcc) should depend on gcc if gcc is already installed.
 # See https://github.com/sagemath/sage/issues/24703
@@ -142,6 +145,7 @@ AC_SUBST([SAGE_DUMMY_PACKAGES])
 AC_SUBST([SAGE_OPTIONAL_INSTALLED_PACKAGES])
 AC_SUBST([SAGE_OPTIONAL_UNINSTALLED_PACKAGES])
 AC_SUBST([SAGE_SDIST_PACKAGES])
+m4_popdef([SPKG_NAMES])
 ])
 
 
@@ -346,38 +350,13 @@ AC_DEFUN([SAGE_SPKG_FINALIZE], [dnl
     dnl
     dnl Determine package dependencies
     dnl
-    AS_IF([test -f "$DIR/dependencies"], [dnl
-        dnl - the # symbol is treated as comment which is removed
-        AS_VAR_SET([DEPS], [`sed 's/^ *//; s/ *#.*//; q' $DIR/dependencies`])
-    ], [dnl
-        AS_VAR_SET([DEPS], [])
-    ])
-    AS_IF([test -f "$DIR/dependencies_build"], [dnl
-        dnl - the # symbol is treated as comment which is removed
-        AS_VAR_SET([BUILD_DEPS], [`sed 's/^ *//; s/ *#.*//; q' $DIR/dependencies_build`])
-    ], [dnl
-        dnl No 'dependencies_build' file, so reuse 'dependencies' for that
-        AS_VAR_COPY([BUILD_DEPS], [DEPS])
-        AS_VAR_SET([DEPS], [])
-    ])
-    AS_IF([test -f "$DIR/dependencies_optional"], [dnl
-        for a in $(sed 's/^ *//; s/ *#.*//; q' "$DIR/dependencies_optional"); do
-            AS_VAR_APPEND([BUILD_DEPS], [' $(optional_inst_'$a') '])
-        done
-    ])
-    AS_CASE(["$BUILD_DEPS"], [*\|*], [], [AS_VAR_APPEND([BUILD_DEPS], [" |"])])
-    AS_IF([test -f "$DIR/dependencies_order_only"], [dnl
-        ADD_DEPS=$(echo $(sed 's/^ *//; s/ *#.*//; q' $DIR/dependencies_order_only))
-        AS_VAR_APPEND([BUILD_DEPS], [" $ADD_DEPS"])
-    ], [dnl
-        m4_case(SPKG_SOURCE, [pip], [AS_VAR_APPEND([BUILD_DEPS], [' pip'])], [:])dnl
-    ])
-    AS_IF([test -f "$DIR/dependencies_check"], [dnl
-        AS_VAR_SET([CHECK_DEPS], [$(sed 's/^ *//; s/ *#.*//; q' $DIR/dependencies_check)])
-    ], [dnl
-        AS_VAR_SET([CHECK_DEPS], [])
-    ])
-    dnl
+    AS_VAR_COPY([BUILD_DEPS], [build_deps_]SPKG_NAME)
+    for a in [$optional_deps_]SPKG_NAME; do
+        AS_VAR_APPEND([BUILD_DEPS], [' $(optional_inst_'$a') '])
+    done
+    AS_VAR_APPEND([BUILD_DEPS], [" | $order_only_deps_]SPKG_NAME["])
+    AS_VAR_COPY([DEPS], [runtime_deps_]SPKG_NAME)
+    AS_VAR_COPY([CHECK_DEPS], [check_deps_]SPKG_NAME)
     SAGE_PACKAGE_DEPENDENCIES="${SAGE_PACKAGE_DEPENDENCIES}$(printf '\nbuild_deps_')SPKG_NAME = ${BUILD_DEPS}$(printf '\ndeps_')SPKG_NAME = ${DEPS}$(printf '\ncheck_deps_')SPKG_NAME = ${CHECK_DEPS}"
     dnl
     dnl Determine package build rules