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

Merge latest upstream changes #5

Closed
wants to merge 67 commits into from

Conversation

d-torrance
Copy link
Member

I should have paid more attention before opening #4, but we actually switched from using this fork for the M2 givaro submodule to the main upstream repository back in Macaulay2/M2#3324 because it includes some additional fixes for newer versions of GCC.

Until upstream merges my PR fixing the GCC 15 bug, I suppose we should go back to using this fork. So let's merge in all the latest upstream changes.

ClementPernet and others added 22 commits October 28, 2022 16:00
Fixes failure to compile on GCC 13.
Add missing #include <cstdint> for (u)int64_t
LGTM, thanks.
Add installation instructions for cloned repositories
There's one instance of VAR+=" value" in the configure script, but
that only works in bash. With dash, for example, it results in

  checking whether gmp version is at least 40000... yes
  ./configure: 17953: REQUIRED_FLAGS+= : not found

We change it to a VAR="${VAR} value" instead.
@mahrud
Copy link
Member

mahrud commented Oct 4, 2024

Don't merge the changes, just push the latest upstream commit.

@d-torrance
Copy link
Member Author

d-torrance commented Oct 4, 2024

Sounds good -- I reset this branch to the one from my upstream PR. So it's just upstream's master branch with one additional commit with the bug fix.

Edit: I realized I didn't need that last commit since it's already been added with the last PR. So this branch is just exactly upstream's master, like Mahrud suggested.

@d-torrance
Copy link
Member Author

This PR is no longer necessary as upstream has merged the fix for the GCC 15 bug.

@d-torrance d-torrance closed this Nov 26, 2024
@d-torrance d-torrance deleted the merge-upstream branch November 26, 2024 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants