Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create build/bin/sage-build-env-config and call it from build/make/deps; add sage --buildsh #29052

Closed
mkoeppe opened this issue Jan 20, 2020 · 39 comments

Comments

@mkoeppe
Copy link
Contributor

mkoeppe commented Jan 20, 2020

This is part of #21707 - "Split sage-env into 5".

We set up a new configure-generated, to-be-sourced 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.

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.


Follow-up:

  • build/make/install contains more environment settings that should be reviewed for moving to sage-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

@mkoeppe mkoeppe added this to the sage-9.1 milestone Jan 20, 2020
@mkoeppe

This comment has been minimized.

@mkoeppe

This comment has been minimized.

@mkoeppe mkoeppe changed the title Create build/bin/sage-build-env and call it from build/make/deps; add sage --buildsh Create build/bin/sage-build-env-config and call it from build/make/deps; add sage --buildsh Jan 20, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jan 20, 2020

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jan 20, 2020

Commit: e3e5a08

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jan 20, 2020

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

e3e5a08build/make/deps, build/make.Makefile.in: Source build/bin/sage-build-env-config for building sagelib and for script packages

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jan 20, 2020

comment:6

Updated the branch that was on #21707.

@mkoeppe

This comment has been minimized.

@jhpalmieri
Copy link
Member

comment:8

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.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jan 21, 2020

comment:9

Thanks! Will do.

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jan 21, 2020

Changed commit from e3e5a08 to 4a96e26

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jan 21, 2020

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

7ea77bbDocument 'sage -buildsh' in the output of 'sage -advanced'
4a96e26src/doc/en/reference/repl/options.rst: Document sage --buildsh

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jan 22, 2020

Changed commit from 4a96e26 to 80c6bfd

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jan 22, 2020

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

80c6bfdMerge tag '9.1.beta1' into t/29052/create_build_bin_sage_build_env_and_call_it_from_build_make_deps__add_sage___buildsh

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jan 22, 2020

comment:12

Merged, ready for review

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 6, 2020

Changed commit from 80c6bfd to ecb6a8b

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 6, 2020

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

5244060Split out build/bin/sage-build-env-config from sage-env-config
96b6c58src/bin/sage: Add -buildsh
3491a9dbuild/make/deps, build/make.Makefile.in: Source build/bin/sage-build-env-config for building sagelib and for script packages
11f6797Document 'sage -buildsh' in the output of 'sage -advanced'
ecb6a8bsrc/doc/en/reference/repl/options.rst: Document sage --buildsh

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 6, 2020

comment:14

Rebased on 9.1.beta3, needs review

@dimpase
Copy link
Member

dimpase commented Feb 13, 2020

comment:16

some places say -buildsh, some say --build-sh, some say --buildsh

what's the correct one?

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 14, 2020

Changed commit from ecb6a8b to a0c3c59

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 14, 2020

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

a0c3c59Fix "--build-sh" -> "--buildsh" in a comment

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 14, 2020

comment:18

Both -buildsh and --buildsh work.

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 16, 2020

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

c1f0e62Merge tag '9.1.beta4' into t/29052/create_build_bin_sage_build_env_and_call_it_from_build_make_deps__add_sage___buildsh

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 16, 2020

Changed commit from a0c3c59 to c1f0e62

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 21, 2020

comment:20

Patchbot errors on helmholtz are due to bootstrap prerequisites missing on that host.

Needs review...

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 22, 2020

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

0dc97dbClean src/doc/en/installation/*.txt in bootstrap-clean, not misc-clean
8bd4f53Merge 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

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 22, 2020

Changed commit from c1f0e62 to 8bd4f53

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 22, 2020

Dependencies: #29233

@dimpase
Copy link
Member

dimpase commented Feb 24, 2020

comment:23

ok

@dimpase
Copy link
Member

dimpase commented Feb 24, 2020

Reviewer: Dima Pasechnik

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 24, 2020

comment:24

Thank you!

@vbraun
Copy link
Member

vbraun commented Feb 25, 2020

comment:25
[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

@dimpase
Copy link
Member

dimpase commented Feb 26, 2020

comment:26

was it a build from scratch, or an incremental one?

@vbraun
Copy link
Member

vbraun commented Feb 26, 2020

comment:27

Both incremental and after "make distclean"

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 27, 2020

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

2ab9b09Move SAGE_PKG_CONFIG_PATH, SAGE_NAUTY_BINS_PREFIX back to src/bin/sage-env-config.in

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Feb 27, 2020

Changed commit from 8bd4f53 to 2ab9b09

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 27, 2020

comment:29

Thanks for catching this.

@dimpase
Copy link
Member

dimpase commented Feb 27, 2020

Changed reviewer from Dima Pasechnik to Dima Pasechnik, Volker Braun

@dimpase
Copy link
Member

dimpase commented Feb 27, 2020

comment:30

OK, it works now. The previous iteration somehow built, but didn't work, as it turned out, sorry.

@vbraun
Copy link
Member

vbraun commented Feb 29, 2020

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants