Merge build/make/deps into build/make/Makefile.in
Closed this issue · 24 comments
The split between these two files seems arbitrary, and after many changes to the build system, the naming of the file deps is no longer meaningful. We merge the two files.
Depends on #28000
CC: @dimpase @embray @jhpalmieri @orlitzky
Component: build
Author: Matthias Koeppe
Branch/Commit: e1a9413
Reviewer: Dima Pasechnik
Issue created by migration from https://trac.sagemath.org/ticket/29098
pushing these forward to 9.2
Author: Matthias Koeppe
Description changed:
---
+++
@@ -1,2 +1,2 @@
-The split between these two files seems arbitrary.
+The split between these two files seems arbitrary, and after many changes to the build system, the naming of the file `deps` is no longer meaningful. We merge the two files.
Reviewer: Dima Pasechnik
lgtm
Thanks!
Merge conflict
ok, an automatic rebase did the job.
It was probably a merge conflict against Volker's development branch (which has not been pushed so far)
Merge conflict
New commits:
f368e32 | trac 28000: rebase commits from Erik M. Bray : |
f372273 | build/pkgs/gcc: Add gentoo patch |
7bfc760 | .github/workflows/tox-gcc_spkg.yml: New |
df68848 | build/pkgs/gcc/spkg-configure.m4: Reject gcc (gnu) >= 10 |
90804c9 | Updated [SageMath](../wiki/SageMath) version to 9.1.rc5 |
6165a4e | Updated [SageMath](../wiki/SageMath) version to 9.1 |
10be6a8 | Merge build/make/deps into build/make/Makefile.in |
Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. This was a forced push. New commits:
94ef2f7 | Merge branch 'u/jhpalmieri/python3/ticket-28000' of git://trac.sagemath.org/sage into t/29098/build/merge_build_make_deps_into_build_make_makefile_in |
e1a9413 | Merge build/make/deps into build/make/Makefile.in |
Rebased on top of the conflicting ticket
Changed branch from u/mkoeppe/build/merge_build_make_deps_into_build_make_makefile_in to e1a9413