From b3f7d3426499114eed31882f06bdc6cc3b7053f1 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 27 Sep 2021 13:49:19 -0700 Subject: [PATCH 1/4] .gitignore: Add /venv --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cf553895adb..91838a1627c 100644 --- a/.gitignore +++ b/.gitignore @@ -182,6 +182,7 @@ src/*.egg-info/ /src/bin/sage-src-env-config # Virtual environments +/venv src/.env src/.venv src/env/ From fc4b641f651968af7fd8c4accb5841021ea0390c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 28 Sep 2021 13:37:45 -0700 Subject: [PATCH 2/4] configure.ac: Remove conveniene symlinks before (re)creating them --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 48600bea7b5..f6078401bf8 100644 --- a/configure.ac +++ b/configure.ac @@ -507,6 +507,7 @@ AC_CONFIG_COMMANDS(links, [ SYMLINK="${ac_top_build_prefix}prefix" AS_IF([test -L "$SYMLINK" -o ! -e "$SYMLINK"], [ AC_MSG_NOTICE([creating convenience symlink $SYMLINK -> $SAGE_LOCAL]) + rm -f "$SYMLINK" ln -sf "$SAGE_LOCAL" "$SYMLINK" ], [ AC_MSG_NOTICE([cannot create convenience symlink $SYMLINK -> $SAGE_LOCAL because the file exists and is not a symlink; this is harmless]) @@ -514,6 +515,7 @@ AC_CONFIG_COMMANDS(links, [ SYMLINK="${ac_top_build_prefix}venv" AS_IF([test -L "$SYMLINK" -o ! -e "$SYMLINK"], [ AC_MSG_NOTICE([creating convenience symlink $SYMLINK -> $SAGE_VENV]) + rm -f "$SYMLINK" ln -sf "$SAGE_VENV" "$SYMLINK" ], [ AC_MSG_NOTICE([cannot create convenience symlink $SYMLINK -> $SAGE_VENV because the file exists and is not a symlink; this is harmless]) From 8bcbf1d919d7d90cefe1442a23aaa66df4ecd2d3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 28 Sep 2021 15:21:42 -0700 Subject: [PATCH 3/4] Makefile (distclean): Remove convenience symlinks prefix, venv --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 567bffbffd0..444e4f9e4ad 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,7 @@ distclean: build-clean @echo "Deleting all remaining output from build system ..." rm -rf local rm -f src/bin/sage-env-config + rm -f prefix venv # Delete all auto-generated files which are distributed as part of the # source tarball From dcb4a08a1d5e5e2363c4b6e2f2f3d852efd3aae0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 29 Sep 2021 15:24:23 -0700 Subject: [PATCH 4/4] configure.ac: Indicate default in help string for --with-sage-venv --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f6078401bf8..6f59a5ea128 100644 --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,7 @@ SAGE_SRC="$SAGE_ROOT/src" SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed" AC_ARG_WITH([sage-venv], - [AS_HELP_STRING([--with-sage-venv={auto,yes,no,SAGE_VENV}], + [AS_HELP_STRING([--with-sage-venv={auto (default),yes,no,SAGE_VENV}], [put Python packages into an installation hierarchy separate from prefix])], [SAGE_VENV="$withval"], [SAGE_VENV="auto"])