sagemath/sage

Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/bin

Closed this issue · 27 comments

We remove some unused environment variables from the sage runtime environment.

Part of Meta-ticket #21707: Split sage-env into 5 to clean up sage configuration

Depends on #21559
Depends on #29929
Depends on #30088

CC: @orlitzky @kiwifb @antonio-rojas @vbraun

Component: build

Author: Matthias Koeppe

Branch/Commit: 7c91fb4

Reviewer: John Palmieri, François Bissey

Issue created by migration from https://trac.sagemath.org/ticket/29825

Commit: 20b81cc

Description changed:

--- 
+++ 
@@ -1 +1,2 @@
+We remove some unused environment variables from the sage runtime environment.
 

Author: Matthias Koeppe

New commits:

a61ce1esrc/bin/sage-env-config.in: Do not export CONFIGURED_CC etc. and SAGE_PKG_CONFIG_PATH; only used in sage-env
f0e37adbuild/make/install: Move SAGE_SPKG_SCRIPTS here from src/bin/sage-env; only used during build
20b81ccsrc/bin/sage-env: Do not set SAGE_PKGCONFIG; only use in build/ and already set in build/make/install

Description changed:

--- 
+++ 
@@ -1,2 +1,3 @@
 We remove some unused environment variables from the sage runtime environment.
 
+Part of Meta-ticket #21707: Split sage-env into 5 to clean up sage configuration

Reviewer: John Palmieri

comment:6

Looks okay to me.

comment:7

Thanks!

Changed commit from 20b81cc to none

comment:9

This breaks sage -sdist which is part of the release process:

rm -f /openblas.pc
(echo "Name: openblas"; echo "Description: OpenBLAS"; echo "Version: 0.3"; echo "Libs: -lopenblas ") > "/openblas.pc"
/bin/sh: /openblas.pc: Permission denied
make[1]: *** [Makefile:59: /openblas.pc] Error 1
make[1]: Leaving directory '/home/release/Sage/build/make'
make: *** [Makefile:1766: download-for-sdist] Error 2

Dependencies: #21559

Changed dependencies from #21559 to #21559, #29929

Changed dependencies from #21559, #29929 to #21559, #29929, #30088

Branch pushed to git repo; I updated commit sha1. New commits:

46ac26eMove src/bin/sage-clone-source, src/bin/sage-sdist to build/bin
c1eb3eaMakefile: Make dist a phony target
comment:18

LGTM. This is all fairly minor spring cleaning. Apart from the dist stuff which was annoying.

Changed reviewer from John Palmieri to John Palmieri, François Bissey

comment:19

Thanks.

comment:20
[sagelib-9.2.beta6] copying bin/sage-cachegrind -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-callgrind -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-massif -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-omega -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-valgrind -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-version.sh -> build/scripts-3.7
[sagelib-9.2.beta6] copying and adjusting bin/sage-cleaner -> build/scripts-3.7
[sagelib-9.2.beta6] copying and adjusting bin/sage-list-packages -> build/scripts-3.7
[sagelib-9.2.beta6] error: file '/home/release/Sage/src/bin/sage-clone-source' does not exist
[sagelib-9.2.beta6] 
[sagelib-9.2.beta6] real        5m25.685s
[sagelib-9.2.beta6] user        49m14.730s
[sagelib-9.2.beta6] sys 1m10.018s
make[4]: *** [Makefile:2090: sagelib-no-deps] Error 1
make[4]: Leaving directory '/home/release/Sage/build/make'
make[3]: *** [Makefile:2090: /home/release/Sage/local/var/lib/sage/installed/sagelib-9.2.beta6] Error 2
make[3]: Leaving directory '/home/release/Sage/build/make'
make[2]: *** [Makefile:1701: all-start] Error 2
make[2]: Leaving directory '/home/release/Sage/build/make'

Changed commit from c1eb3ea to 7c91fb4

Branch pushed to git repo; I updated commit sha1. New commits:

7c91fb4src/setup.py: Remove sage-clone-source, sage-sdist from list of installed sagelib scripts
comment:23

Now, that's something I should have checked. All good now as far as I can see it.

comment:24

Thanks!