Closed mkoeppe closed 4 years ago
Description changed:
---
+++
@@ -5,7 +5,7 @@
1. Sage-the-distribution while building spkgs,
2. Sage-the-distribution for building sagelib.
-The new script sources `src/bin/sage-env`.
+The new script is used in addition to `src/bin/sage-env` in these two contexts.
We add a command `sage --buildsh`, like `sage --sh` but using the larger environment.
Description changed:
---
+++
@@ -1,6 +1,6 @@
This is part of #21707 - "Split `sage-env` into 5".
-We set up a new `configure`-generated, to-be-`source`d shell script `build/bin/sage-build-env` to which we move environment variable settings from `src/bin/sage-env[-config]` that are only needed for:
+We set up a new `configure`-generated, to-be-`source`d shell script `build/bin/sage-build-env-config` to which we move environment variable settings from `src/bin/sage-env[-config]` that are only needed for:
1. Sage-the-distribution while building spkgs,
2. Sage-the-distribution for building sagelib.
Commit: e3e5a08
Branch pushed to git repo; I updated commit sha1. New commits:
e3e5a08 | build/make/deps, build/make.Makefile.in: Source build/bin/sage-build-env-config for building sagelib and for script packages |
Updated the branch that was on #21707.
Description changed:
---
+++
@@ -9,3 +9,7 @@
We add a command `sage --buildsh`, like `sage --sh` but using the larger environment.
+---
+
+Follow-up:
+- `build/make/install` contains more environment settings that should be reviewed for moving to `sage-build-env-config`
You need to document sage --buildsh
: at the top of src/bin/sage
, in src/doc/en/reference/repl/options.rst
, maybe in src/doc/en/installation/source.rst
, maybe in the developer's guide.
Thanks! Will do.
Branch pushed to git repo; I updated commit sha1. New commits:
80c6bfd | Merge tag '9.1.beta1' into t/29052/create_build_bin_sage_build_env_and_call_it_from_build_make_deps__add_sage___buildsh |
Merged, ready for review
Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:
5244060 | Split out build/bin/sage-build-env-config from sage-env-config |
96b6c58 | src/bin/sage: Add -buildsh |
3491a9d | build/make/deps, build/make.Makefile.in: Source build/bin/sage-build-env-config for building sagelib and for script packages |
11f6797 | Document 'sage -buildsh' in the output of 'sage -advanced' |
ecb6a8b | src/doc/en/reference/repl/options.rst: Document sage --buildsh |
Rebased on 9.1.beta3, needs review
some places say -buildsh
, some say --build-sh
, some say --buildsh
what's the correct one?
Branch pushed to git repo; I updated commit sha1. New commits:
a0c3c59 | Fix "--build-sh" -> "--buildsh" in a comment |
Both -buildsh
and --buildsh
work.
Branch pushed to git repo; I updated commit sha1. New commits:
c1f0e62 | Merge tag '9.1.beta4' into t/29052/create_build_bin_sage_build_env_and_call_it_from_build_make_deps__add_sage___buildsh |
Patchbot errors on helmholtz
are due to bootstrap prerequisites missing on that host.
Needs review...
Branch pushed to git repo; I updated commit sha1. New commits:
0dc97db | Clean src/doc/en/installation/*.txt in bootstrap-clean, not misc-clean |
8bd4f53 | Merge branch 't/29233/bootstrap____make_distclean_broken' into t/29052/create_build_bin_sage_build_env_and_call_it_from_build_make_deps__add_sage___buildsh |
Dependencies: #29233
ok
Reviewer: Dima Pasechnik
Thank you!
[dochtml] Error building the documentation.
[dochtml] Traceback (most recent call last):
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/runpy.py", line 193, in _run_module_as_main
[dochtml] "__main__", mod_spec)
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/runpy.py", line 85, in _run_code
[dochtml] exec(code, run_globals)
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/site-packages/sage_setup/docbuild/__main__.py", line 2, in <module>
[dochtml] main()
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/site-packages/sage_setup/docbuild/__init__.py", line 1720, in main
[dochtml] builder()
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/site-packages/sage_setup/docbuild/__init__.py", line 327, in _wrapper
[dochtml] getattr(get_builder(document), 'inventory')(*args, **kwds)
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/site-packages/sage_setup/docbuild/__init__.py", line 552, in _wrapper
[dochtml] self._build_everything_except_bibliography(lang, format, *args, **kwds)
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/site-packages/sage_setup/docbuild/__init__.py", line 538, in _build_everything_except_bibliography
[dochtml] build_many(build_ref_doc, non_references)
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/site-packages/sage_setup/docbuild/__init__.py", line 280, in build_many
[dochtml] _build_many(target, args, processes=NUM_THREADS)
[dochtml] File "/home/buildbot/slave/sage_git/build/local/lib/python3.7/site-packages/sage_setup/docbuild/utils.py", line 283, in build_many
[dochtml] raise worker_exc.original_exception
[dochtml] pkgconfig.pkgconfig.PackageNotFoundError: cblas not found not found
was it a build from scratch, or an incremental one?
Both incremental and after "make distclean"
Branch pushed to git repo; I updated commit sha1. New commits:
2ab9b09 | Move SAGE_PKG_CONFIG_PATH, SAGE_NAUTY_BINS_PREFIX back to src/bin/sage-env-config.in |
Thanks for catching this.
Changed reviewer from Dima Pasechnik to Dima Pasechnik, Volker Braun
OK, it works now. The previous iteration somehow built, but didn't work, as it turned out, sorry.
Changed branch from u/mkoeppe/create_build_bin_sage_build_env_and_call_it_from_build_make_depsaddsagebuildsh to 2ab9b09
This is part of #21707 - "Split
sage-env
into 5".We set up a new
configure
-generated, to-be-source
d shell scriptbuild/bin/sage-build-env-config
to which we move environment variable settings fromsrc/bin/sage-env[-config]
that are only needed for:The new script is used in addition to
src/bin/sage-env
in these two contexts.We add a command
sage --buildsh
, likesage --sh
but using the larger environment.Follow-up:
build/make/install
contains more environment settings that should be reviewed for moving tosage-build-env-config
Depends on #29233
CC: @dimpase @embray @jdemeyer @kiwifb @isuruf
Component: build
Author: Matthias Koeppe
Branch/Commit:
2ab9b09
Reviewer: Dima Pasechnik, Volker Braun
Issue created by migration from https://trac.sagemath.org/ticket/29052