Opened 3 years ago

Closed 3 years ago

#29098 closed enhancement (fixed)

Merge build/make/deps into build/make/Makefile.in

Reported by: Matthias Köppe Owned by:
Priority: major Milestone: sage-9.2
Component: build Keywords:
Cc: Dima Pasechnik, Erik Bray, John Palmieri, Michael Orlitzky Merged in:
Authors: Matthias Koeppe Reviewers: Dima Pasechnik
Report Upstream: N/A Work issues:
Branch: e1a9413 (Commits, GitHub, GitLab) Commit: e1a9413b72a001482f3e7775e053853f3cd75f96
Dependencies: #28000 Stopgaps:

Status badges

Description (last modified by Matthias Köppe)

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 3 years ago by Matthias Köppe

Milestone: sage-9.1sage-9.2

pushing these forward to 9.2

comment:2 Changed 3 years ago by Matthias Köppe

Branch: u/mkoeppe/merge_build_make_deps_into_build_make_makefile_in

comment:3 Changed 3 years ago by Matthias Köppe

Cc: John Palmieri added
Commit: 768a314f478f915a317527821f7024dce4a25ed1

New commits:

768a314Merge build/make/deps into build/make/Makefile.in

comment:4 Changed 3 years ago by Matthias Köppe

Authors: Matthias Koeppe
Status: newneeds_review

comment:5 Changed 3 years ago by Matthias Köppe

Cc: Michael Orlitzky added

comment:6 Changed 3 years ago by Matthias Köppe

Description: modified (diff)

comment:7 Changed 3 years ago by Dima Pasechnik

Reviewers: Dima Pasechnik
Status: needs_reviewpositive_review

lgtm

comment:8 Changed 3 years ago by Matthias Köppe

Thanks!

comment:9 Changed 3 years ago by Volker Braun

Status: positive_reviewneeds_work

Merge conflict

comment:10 Changed 3 years ago by Dima Pasechnik

Branch: u/mkoeppe/merge_build_make_deps_into_build_make_makefile_inu/dimpase/build/merge_build_make_deps_into_build_make_makefile_in
Commit: 768a314f478f915a317527821f7024dce4a25ed170316835521301c4b9cdf9a398f097cb683aeb56
Status: needs_workneeds_review

New commits:

7031683Merge build/make/deps into build/make/Makefile.in

comment:11 Changed 3 years ago by Dima Pasechnik

Status: needs_reviewpositive_review

ok, an automatic rebase did the job.

comment:12 Changed 3 years ago by Matthias Köppe

It was probably a merge conflict against Volker's development branch (which has not been pushed so far)

comment:13 Changed 3 years ago by Volker Braun

Status: positive_reviewneeds_work

Merge conflict

comment:14 Changed 3 years ago by Matthias Köppe

Dependencies: #28000

comment:15 Changed 3 years ago by Matthias Köppe

Branch: u/dimpase/build/merge_build_make_deps_into_build_make_makefile_inu/mkoeppe/build/merge_build_make_deps_into_build_make_makefile_in

comment:16 Changed 3 years ago by Matthias Köppe

Commit: 70316835521301c4b9cdf9a398f097cb683aeb5610be6a8c796f1d2f6dcdd8d217c0ab0bb3fe0b73
Status: needs_workpositive_review

New commits:

f368e32trac 28000: rebase commits from Erik M. Bray <erik.bray@lri.fr>:
f372273build/pkgs/gcc: Add gentoo patch
7bfc760.github/workflows/tox-gcc_spkg.yml: New
df68848build/pkgs/gcc/spkg-configure.m4: Reject gcc (gnu) >= 10
90804c9Updated SageMath version to 9.1.rc5
6165a4eUpdated SageMath version to 9.1
10be6a8Merge build/make/deps into build/make/Makefile.in

comment:17 Changed 3 years ago by git

Commit: 10be6a8c796f1d2f6dcdd8d217c0ab0bb3fe0b73e1a9413b72a001482f3e7775e053853f3cd75f96
Status: positive_reviewneeds_review

Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. This was a forced push. New commits:

94ef2f7Merge 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
e1a9413Merge build/make/deps into build/make/Makefile.in

comment:18 Changed 3 years ago by Matthias Köppe

Status: needs_reviewpositive_review

Rebased on top of the conflicting ticket

comment:19 Changed 3 years ago by Volker Braun

Branch: u/mkoeppe/build/merge_build_make_deps_into_build_make_makefile_ine1a9413b72a001482f3e7775e053853f3cd75f96
Resolution: fixed
Status: positive_reviewclosed
Note: See TracTickets for help on using tickets.