build/bin/sage-spkg: Handle an optional argument to set the installation tree (default SAGE_LOCAL)

[mkoeppe]

We handle a new optional argument to sage-spkg, which sets the installation tree - the new variable SAGE_INST_LOCAL (default: $SAGE_LOCAL) for the package installation scripts. (The script sage-spkg-uninstall already accepts this optional argument.)

We also move the definition of SAGE_SPKG_INST and SAGE_SPKG_WHEELS out of build/bin/install into sage-spkg (and into Makefile.in for script packages). This is so that they can depend on SAGE_INST_LOCAL.

Thus, the installation location of the installation records now depends on the installation tree - it is $SAGE_INST_LOCAL/var/lib/sage/{installed,scripts,wheels}.

This is preparation for #29013 - which proposes to install Python packages in $SAGE_VENV instead of $SAGE_LOCAL.

[git]

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

​f2e7075	Merge tag '9.2.beta13' into t/29500/install_all_python_packages_via_pip_wheel__create_pep_503_simple_repository_for_wheels
​8fc7f9c	Merge branch 't/29500/install_all_python_packages_via_pip_wheel__create_pep_503_simple_repository_for_wheels' into t/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix

[git]

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

​0f1b7aa	build/make/install: Do not set SAGE_SPKG_INST here; set it in build/make/Makefile.in
​1baf8ea	WIP
​bd0fd2f	Merge branch 't/29500/install_all_python_packages_via_pip_wheel__create_pep_503_simple_repository_for_wheels' into t/30657/fix_up__sage__p_
​2e20f23	build/bin/sage-spkg: Move SAGE_SPKG_{INST,SCRIPTS,WHEELS} setting here from build/bin/install, make them relative to SAGE_INST_LOCAL
​be2417c	Merge tag '9.2.beta14' into t/30657/fix_up__sage__p_
​8ee7ee2	build/make/install: Set SAGE_SPKG_WHEELS also here so that script packages still work
​a713c39	Merge branch 't/30657/fix_up__sage__p_' into t/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix

[git]

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

​8ef2508	Merge tag '9.3.beta2' into t/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix
​333c5b5	build/bin/sage-spkg: Accept installation tree as an optional argument, like sage-spkg-uninstall

[git]

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

​dbbd614

build/bin/sage-spkg: From bash -x back to bash

[git]

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

​cb15169

Makefile, build/make/Makefile.in: Fix 'make list'

[mkoeppe]

Hoping we can make progress on this ticket this week - ​https://wiki.sagemath.org/days111

[gh-kliem]

LGTM.

[mkoeppe]

Thank you!

[vbraun]

Merge conflict

[git]

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

​9c5e8a2	add references to `bin/sage-build-env` and `bin/sage-build-env-config`
​4b8933b	remove incorrect `$` in `build/bin/sage-build-env`
​071b8cc	Revert "add references to `bin/sage-build-env` and `bin/sage-build-env-config`"
​c51e752	correct comments to makefile
​aa7ecd6	fix that we might have changed $FCFLAGS during configure
​94326db	better solution for dealing with -ffree-form
​87dae61	keep FCFLAGS during gfortran configure
​7577dd4	added quotes
​3bb3099	prepare preciouos variables
​9c9b3bf	Merge commit '3bb309944b7e8542b2ac88ed3c9d9a60e68644d7' of git://trac.sagemath.org/sage into t/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix

[mkoeppe]

Merged #30375

[vbraun]

Breaks making source tarballs:

Sage version 9.3.beta5, release date 2020-12-27
Cloning into '/home/release/Sage/tmp/sage-9.3.beta5'...
done.
Enumerating objects: 737573, done.
Counting objects: 100% (737573/737573), done.
Delta compression using up to 16 threads
Compressing objects: 100% (702757/702757), done.
Writing objects: 100% (737573/737573), done.
Total 737573 (delta 588187), reused 141018 (delta 0), pack-reused 0
Checking connectivity: 737573, done.
Finished cloning Sage sources
Makefile:22: *** This Makefile needs to be invoked by build/make/install.  Stop.
Traceback (most recent call last):
  File "/home/release/opt/bin/git-releasemgr", line 16, in <module>
    cmdline.launch()
  File "/home/release/opt/git-trac-command/git_trac/releasemgr/cmdline.py", line 166, in launch
    app.release(args.version, check=args.check)
  File "/home/release/opt/git-trac-command/git_trac/releasemgr/app.py", line 315, in release
    create_tarball()
  File "/home/release/opt/git-trac-command/git_trac/releasemgr/make_release.py", line 15, in create_tarball
    check_call(['sage', '-sdist'])
  File "/home/release/opt/conda/lib/python2.7/subprocess.py", line 190, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sage', '-sdist']' returned non-zero exit status 2

[git]

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

​36e8f7d	Merge tag '9.3.beta5' into t/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix
​062ef92	build/make/Makefile.in: Fix up 'make dist'

[gh-kliem]

There is two small things that could be fixed along the way:

• make dist does not appear in make --help.
• local/bin/sage-sdist claims it should be called by spkg/bin/sage, but it is really run by local/bin/sage.

The error message This Makefile needs to be invoked by build/make/install seems strange, as there is at least one other legal way to call the Makefile, as we discovered here. If it is not included in the message, I think the comment should be more verbose.

[git]

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

​6eb8f26

build/bin/sage-sdist: Update file comment

[mkoeppe]

Replying to gh-kliem:

There is two small things that could be fixed along the way:

• make dist does not appear in make --help.

My version of make here on macOS does not list any targets on make --help. In any case, beyond the scope of the ticket.

• local/bin/sage-sdist claims it should be called by spkg/bin/sage, but it is really run by local/bin/sage.

Updated.

[git]

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

​7ea44f7

build/make/Makefile.in: Expand comment

[gh-kliem]

Back to positive review.

[mkoeppe]

Thanks.

[gh-kliem]

Apparently we broke sage -b with this ticket.