Trac #30128: always source sage-env-config before sage-env.

The sage-env script needs to know the values of SAGE_ROOT and
SAGE_SCRIPTS_DIR, for example, but due to a chicken-and-egg problem it
can't source the sage-env-config script where they are defined. Since
whoever is sourcing sage-env perforce knows where it is located, this
commit updates those callers to first source sage-env-config. This
solves the inter-dependency, and does so in a POSIX-compatible way.

A future commit will remove the bashism in sage-env that tries to
determine the location of sage-env-config on its own.

Author: orlitzky

bootstrap

@@ -206,6 +206,7 @@ mkdir config 2>/dev/null
 # Get autotools from our own package into PATH (Trac #21214).
 # If Sage has not been built yet, this will fail due to a missing
 # sage-env-config. We just ignore that error.
+source src/bin/sage-env-config 2>/dev/null
 source src/bin/sage-env 2>/dev/null
 
 

build/bin/sage-spkg

@@ -166,6 +166,7 @@ fi
 # The following sets environment variables for building packages.
 # Since this is sourced, it returns a non-zero value on errors rather
 # than exiting.  Using dot suggested by W. Cheung.
+. sage-env-config
 . sage-env
 
 
@@ -490,7 +491,7 @@ export PKG_NAME="$PKG_NAME"
 export PKG_BASE="$PKG_BASE"
 export PKG_VER="$PKG_VER"
 
-for lib in "\$SAGE_ROOT/build/bin/sage-dist-helpers" "\$SAGE_SRC/bin/sage-env" "\$SAGE_ROOT/build/bin/sage-build-env-config"; do
+for lib in "\$SAGE_ROOT/build/bin/sage-dist-helpers" "\$SAGE_SRC/bin/sage-env-config" "\$SAGE_SRC/bin/sage-env" "\$SAGE_ROOT/build/bin/sage-build-env-config"; do
     source "\$lib"
     if [ \$? -ne 0 ]; then
         echo >&2 "Error: failed to source \$lib"

build/make/Makefile.in

@@ -485,13 +485,15 @@ endif
 #
 # $(INST)/<pkgname>-<pkgvers>: <dependencies>
 #     $(AM_V_at)cd '$SAGE_ROOT' && \\
+#         . '$SAGE_ROOT/src/bin/sage-env-config' && \\
 #         . '$SAGE_ROOT/src/bin/sage-env' && \\
 #         sage-logger -p '$SAGE_ROOT/build/pkgs/<pkgname>/spkg-install' '$(SAGE_LOGS)/<pkgname>.log'
 #
 # <pkgname>: $(INST)/<pkgname>-<pkgvers>
 #
 # <pkgname>-clean:
 #     -$(AM_V_at)cd '$SAGE_ROOT' && \\
+#         . '$SAGE_ROOT/src/bin/sage-env-config' && \\
 #         . '$SAGE_ROOT/src/bin/sage-env' && \\
 #         '$SAGE_ROOT/build/pkgs/$PKG_NAME/spkg-uninstall'
 
@@ -504,15 +506,19 @@ $(1)-build-deps: $(3)
 
 $$(INST)/$(1)-$(2): $(3)
 	$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
-		. '$$(SAGE_ROOT)/src/bin/sage-env' && . '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
+		. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
+		. '$$(SAGE_ROOT)/src/bin/sage-env' && \
+		. '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
 		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log'
 	touch "$$@"
 
 $(1): $$(INST)/$(1)-$(2)
 
 $(1)-uninstall:
 	-$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
-		. '$$(SAGE_ROOT)/src/bin/sage-env' && . '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
+		. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
+		. '$$(SAGE_ROOT)/src/bin/sage-env' && \
+		. '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
 		'$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-uninstall'
 	-rm -f "$$(INST)/$(1)-$(2)"
 

build/pkgs/gcc/spkg-configure.m4

@@ -41,7 +41,7 @@ AC_DEFUN([SAGE_CHECK_BROKEN_GCC], [
             echo '#include <complex>' >conftest.cpp
             echo 'auto inf = 1.0 / std::complex<double>();' >>conftest.cpp
 
-            if ! bash -c "source '$SAGE_SRC/bin/sage-env' && g++ -O3 -c -o conftest.o conftest.cpp"; then
+            if ! bash -c "source '$SAGE_SRC/bin/sage-env-config' && source '$SAGE_SRC/bin/sage-env' && g++ -O3 -c -o conftest.o conftest.cpp"; then
                 SAGE_BROKEN_GCC=yes
             fi
             rm -f conftest.*

src/bin/sage

@@ -196,7 +196,8 @@ fi
 # append -env to that). We redirect stdout to stderr, which is safer
 # for scripts.
 #####################################################################
-if [ -f "$0-env" ]; then
+if [ -f "$0-env-config" ] && [ -f "$0-env" ]; then
+    . "$0-env-config" >&2
     . "$0-env" >&2
     if [ $? -ne 0 ]; then
         echo >&2 "Error setting environment variables by sourcing '$0-env';"

src/mac-app/start-sage.sh

@@ -17,6 +17,7 @@ NB_TYPE="$3"
 
 # Read environment variables
 cd $(dirname $SAGE_EXECUTABLE)
+source local/bin/sage-env-config
 source local/bin/sage-env