Opened 2 years ago
Closed 2 years ago
#29098 closed enhancement (fixed)
Merge build/make/deps into build/make/Makefile.in
Reported by: | mkoeppe | Owned by: | |
---|---|---|---|
Priority: | major | Milestone: | sage-9.2 |
Component: | build | Keywords: | |
Cc: | dimpase, embray, jhpalmieri, mjo | Merged in: | |
Authors: | Matthias Koeppe | Reviewers: | Dima Pasechnik |
Report Upstream: | N/A | Work issues: | |
Branch: | e1a9413 (Commits, GitHub, GitLab) | Commit: | e1a9413b72a001482f3e7775e053853f3cd75f96 |
Dependencies: | #28000 | Stopgaps: |
Description (last modified by )
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.
Change History (19)
comment:1 Changed 2 years ago by
- Milestone changed from sage-9.1 to sage-9.2
comment:2 Changed 2 years ago by
- Branch set to u/mkoeppe/merge_build_make_deps_into_build_make_makefile_in
comment:3 Changed 2 years ago by
- Cc jhpalmieri added
- Commit set to 768a314f478f915a317527821f7024dce4a25ed1
New commits:
768a314 | Merge build/make/deps into build/make/Makefile.in
|
comment:4 Changed 2 years ago by
- Status changed from new to needs_review
comment:5 Changed 2 years ago by
- Cc mjo added
comment:6 Changed 2 years ago by
- Description modified (diff)
comment:7 Changed 2 years ago by
- Reviewers set to Dima Pasechnik
- Status changed from needs_review to positive_review
lgtm
comment:8 Changed 2 years ago by
Thanks!
comment:10 Changed 2 years ago by
- Branch changed from u/mkoeppe/merge_build_make_deps_into_build_make_makefile_in to u/dimpase/build/merge_build_make_deps_into_build_make_makefile_in
- Commit changed from 768a314f478f915a317527821f7024dce4a25ed1 to 70316835521301c4b9cdf9a398f097cb683aeb56
- Status changed from needs_work to needs_review
New commits:
7031683 | Merge build/make/deps into build/make/Makefile.in
|
comment:11 Changed 2 years ago by
- Status changed from needs_review to positive_review
ok, an automatic rebase did the job.
comment:12 Changed 2 years ago by
It was probably a merge conflict against Volker's development branch (which has not been pushed so far)
comment:14 Changed 2 years ago by
- Dependencies set to #28000
comment:15 Changed 2 years ago by
- Branch changed from u/dimpase/build/merge_build_make_deps_into_build_make_makefile_in to u/mkoeppe/build/merge_build_make_deps_into_build_make_makefile_in
comment:16 Changed 2 years ago by
- Commit changed from 70316835521301c4b9cdf9a398f097cb683aeb56 to 10be6a8c796f1d2f6dcdd8d217c0ab0bb3fe0b73
- Status changed from needs_work to positive_review
New commits:
f368e32 | trac 28000: rebase commits from Erik M. Bray <erik.bray@lri.fr>:
|
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 version to 9.1.rc5
|
6165a4e | Updated SageMath version to 9.1
|
10be6a8 | Merge build/make/deps into build/make/Makefile.in
|
comment:17 Changed 2 years ago by
- Commit changed from 10be6a8c796f1d2f6dcdd8d217c0ab0bb3fe0b73 to e1a9413b72a001482f3e7775e053853f3cd75f96
- Status changed from positive_review to needs_review
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
|
comment:18 Changed 2 years ago by
- Status changed from needs_review to positive_review
Rebased on top of the conflicting ticket
comment:19 Changed 2 years ago by
- Branch changed from u/mkoeppe/build/merge_build_make_deps_into_build_make_makefile_in to e1a9413b72a001482f3e7775e053853f3cd75f96
- Resolution set to fixed
- Status changed from positive_review to closed
Note: See
TracTickets for help on using
tickets.
pushing these forward to 9.2