Merge branch 't/29392/__configure___enable_experimental_packages___enable_download_from_upstream_url' into t/29403/ci_cygwin_yml__multi_stage_build

Author: Matthias Koeppe

build/make/Makefile.in

@@ -41,6 +41,12 @@ PCFILES = @SAGE_SYSTEM_FACADE_PC_FILES@
 LN = ln
 SED = sed
 
+# We need to be able to override this to support ./sage -i -c PKG
+SAGE_SPKG = sage-spkg
+
+# These are added to SAGE_SPKG in the call
+SAGE_SPKG_OPTIONS = @SAGE_SPKG_OPTIONS@
+
 # Generate/install sage-specific .pc files.
 # see build/pkgs/gsl/spkg-configure.m4
 $(SAGE_PKGCONFIG)/gsl.pc:
@@ -203,7 +209,7 @@ pkg_deps = \
 #     $(3): package dependencies
 define NORMAL_PACKAGE_templ
 $$(INST)/$(1)-$(2): $(3)
-	+$(AM_V_at)sage-logger -p '$$(SAGE_SPKG) \
+	+$(AM_V_at)sage-logger -p '$$(SAGE_SPKG) $$(SAGE_SPKG_OPTIONS) \
 		$(if $(filter $(1),$(TOOLCHAIN_DEPS)),--keep-existing) \
 		$(1)-$(2)' '$$(SAGE_LOGS)/$(1)-$(2).log'
 

build/make/deps

@@ -12,9 +12,6 @@ else
 AM_V_at =
 endif
 
-# We need to be able to override this to support ./sage -i -c PKG
-SAGE_SPKG = sage-spkg -y -o
-
 # List of targets that can be run using `sage -i` or `sage -f`
 # These should generally have an associated -clean target for `sage -f` to
 # work correctly

configure.ac

@@ -423,6 +423,22 @@ if test "$SAGE_INSTALL_CCACHE" = yes ; then
 fi
 AC_SUBST([SAGE_TOOLCHAIN])
 
+AC_ARG_ENABLE([experimental-packages],
+  [AS_HELP_STRING([--enable-experimental-packages],
+    [allow installing experimental packages (default: no = ask for user confirmation for each package)])])
+AC_ARG_ENABLE([download-from-upstream-url],
+  [AS_HELP_STRING([--enable-download-from-upstream-url],
+    [allow downloading packages from their upstream URL if they cannot be found on the Sage mirrors])])
+
+SAGE_SPKG_OPTIONS=""
+AS_IF([test "x$enable_experimental_packages" = "xyes"], [
+  AS_VAR_APPEND([SAGE_SPKG_OPTIONS], [" -y"])
+])
+AS_IF([test "x$enable_download_from_upstream_url" = "xyes"], [
+  AS_VAR_APPEND([SAGE_SPKG_OPTIONS], [" -o"])
+])
+AC_SUBST([SAGE_SPKG_OPTIONS])
+
 SAGE_SPKG_COLLECT()
 
 # We need sage-env-config to exist before running this.