bootstrap-conda: Do not include packages that declare SAGERUNTIME as …

…a dependency
sagemath · May 17, 2022 · ffde371 · ffde371
1 parent d2b8c4e
commit ffde371
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/bootstrap-conda b/bootstrap-conda
@@ -102,7 +102,9 @@ echo >&2 $0:$LINENO: generating conda environment files
         PKG_SCRIPTS=build/pkgs/$PKG_BASE
         SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/requirements.txt
         PKG_TYPE=$(cat $PKG_SCRIPTS/type)
-        if [ -n "PKG_SYSTEM_PACKAGES" ]; then
+        if grep -q SAGERUNTIME $PKG_SCRIPTS/dependencies 2>/dev/null; then
+            : # cannot install packages that depend on the Sage library
+        else
             case "$PKG_BASE:$PKG_TYPE" in
                 $DEVELOP_SPKG_PATTERN:*) FD=4;;
                 *)                       FD=5;;

diff --git a/build/pkgs/sage_flatsurf/dependencies b/build/pkgs/sage_flatsurf/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) surface_dynamics
+$(PYTHON) | $(PYTHON_TOOLCHAIN) surface_dynamics $(SAGERUNTIME)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/slabbe/dependencies b/build/pkgs/slabbe/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+$(PYTHON) | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME)
 
 ----------
 All lines of this file are ignored except the first.