sage-sdist: don't require sage to be built

build/deps

@@ -458,7 +458,9 @@ $(INST)/sage: \
 		 $(INST)/$(SYMMETRICA) \
 		 $(INST)/$(ZNPOLY) \
 		 $(INST)/csage
-	if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
+	if [ -n "$$SAGE_CLONE_TARGET" ]; then \
+		$(SAGE_SRC)/bin/sage-clone-source "$(SAGE_ROOT)" "$$SAGE_CLONE_TARGET"; \
+	else \
 		cd $(SAGE_SRC) && source bin/sage-env && \
 		$(PIPE) 'time python setup.py install 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
 		touch $@; \
@@ -471,7 +473,7 @@ $(INST)/csage: $(INST)/$(SCONS) \
        $(INST)/$(POLYBORI) \
        $(INST)/$(PYNAC) \
        $(INST)/$(PYTHON)
-	if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
+	if [ -z "$$SAGE_CLONE_TARGET" ]; then \
 		cd $(SAGE_SRC) && source bin/sage-env && cd c_lib && \
 		$(PIPE) 'time scons -Q install 2>&1' 'tee -a $(SAGE_LOGS)/csage-$(SAGE_VERSION).log' && \
 		touch $@; \

build/install

@@ -61,6 +61,14 @@ mkdir -p "$SAGE_LOCAL/lib"
 mkdir -p "$SAGE_SPKG_INST"
 mkdir -p "$SAGE_SHARE"
 
+#######################################################################
+# Setup cloning variables if SAGE_CLONE_TARGET is set
+#######################################################################
+
+if [ -n "$SAGE_CLONE_TARGET" -a -z "$SAGE_SPKG_COPY_UPSTREAM" ]; then
+    export SAGE_SPKG_COPY_UPSTREAM="$SAGE_CLONE_TARGET/upstream"
+fi
+
 ###############################################################################
 # Determine whether to install GCC (gcc, g++, gfortran).
 ###############################################################################

src/bin/sage-sdist

@@ -41,12 +41,11 @@ source "$SAGE_SRC/bin/sage-version.sh"
 echo "Sage version $SAGE_VERSION, release date $SAGE_RELEASE_DATE"
 
 TARGET="sage-$SAGE_VERSION"
-sage-clone-source "$SAGE_ROOT" "$TMP_DIR/$TARGET"
 
 # Download and copy all upstream tarballs (the -B option to make forces
 # all targets to be built unconditionally)
 cd "$SAGE_ROOT/build"
-SAGE_INSTALL_GCC=yes SAGE_SPKG_OPTS="-f -d" SAGE_SPKG_COPY_UPSTREAM="$TMP_DIR/$TARGET/upstream" ./install -B all
+SAGE_INSTALL_GCC=yes SAGE_SPKG_OPTS="-f -d" SAGE_CLONE_TARGET="$TMP_DIR/$TARGET" ./install -B all
 
 # Create source .tar.gz
 cd "$TMP_DIR"