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.

Sign up for GitHub

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

Jump to bottom

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

Closed
mkoeppe opened this issue Jan 29, 2020 · 24 comments
Closed

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

mkoeppe opened this issue Jan 29, 2020 · 24 comments
Labels
c: build p: major / 3 t: enhancement
Milestone
sage-9.2

Comments

@mkoeppe
Copy link
Contributor

mkoeppe commented Jan 29, 2020

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
@mkoeppe mkoeppe added this to the sage-9.1 milestone Jan 29, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Apr 14, 2020

comment:1

pushing these forward to 9.2

@mkoeppe mkoeppe modified the milestones: sage-9.1, sage-9.2 Apr 14, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 15, 2020

Branch: u/mkoeppe/merge_build_make_deps_into_build_make_makefile_in

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 15, 2020

New commits:

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

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 15, 2020

Commit: 768a314

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 15, 2020

Author: Matthias Koeppe

@mkoeppe

This comment has been minimized.

Sign in to view
@dimpase
Copy link
Member

dimpase commented May 17, 2020

Reviewer: Dima Pasechnik

@dimpase
Copy link
Member

dimpase commented May 17, 2020

comment:7

lgtm

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 17, 2020

comment:8

Thanks!

@vbraun
Copy link
Member

vbraun commented May 20, 2020

comment:9

Merge conflict

@dimpase
Copy link
Member

dimpase commented May 21, 2020

New commits:

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

@dimpase
Copy link
Member

dimpase commented May 21, 2020

Changed commit from 768a314 to 7031683

@dimpase
Copy link
Member

dimpase commented May 21, 2020

Changed branch 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

@dimpase
Copy link
Member

dimpase commented May 21, 2020

comment:11

ok, an automatic rebase did the job.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 21, 2020

comment:12

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

@vbraun
Copy link
Member

vbraun commented May 21, 2020

comment:13

Merge conflict

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 22, 2020

Dependencies: #28000

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 22, 2020

Changed branch 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

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 22, 2020

Changed commit from 7031683 to 10be6a8

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 22, 2020

New commits:

f368e32trac 28000: rebase commits from Erik M. Bray :
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](../wiki/SageMath) version to 9.1.rc5
6165a4eUpdated [SageMath](../wiki/SageMath) version to 9.1
10be6a8Merge build/make/deps into build/make/Makefile.in

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 22, 2020

Changed commit from 10be6a8 to e1a9413

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 22, 2020

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

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 22, 2020

comment:18

Rebased on top of the conflicting ticket

@vbraun
Copy link
Member

vbraun commented May 26, 2020

Changed branch from u/mkoeppe/build/merge_build_make_deps_into_build_make_makefile_in to e1a9413

@vbraun vbraun closed this as completed in 64efc5e May 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
c: build p: major / 3 t: enhancement
Projects
None yet
Milestone
sage-9.2
Development

No branches or pull requests
3 participants
@vbraun @dimpase @mkoeppe