Skip to content

flint3: 3.0.1 -> 3.1.2, import C99 compliance patch#369978

Merged
collares merged 1 commit intoNixOS:masterfrom
collares:flint-reserved
Jan 1, 2025
Merged

flint3: 3.0.1 -> 3.1.2, import C99 compliance patch#369978
collares merged 1 commit intoNixOS:masterfrom
collares:flint-reserved

Conversation

@collares
Copy link
Member

@collares collares commented Jan 1, 2025

flintlib/flint#2027

This is an incompatibility between NumPy 2 and FLINT which is currently breaking Sage builds.

cc @paparodeo

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 1, 2025
@collares collares changed the title flint3: import C99 compliance patch (reserved identifier) flint3: 3.0.1 -> 3.1.2, import C99 compliance patch Jan 1, 2025
@paparodeo
Copy link
Contributor

when I try to build I just get the yes.

checking whether g++ accepts -std=c++11... yes
= yes
...
= yes

looks like there is a cmake build. maybe that one works a little better.

@collares
Copy link
Member Author

collares commented Jan 1, 2025

when I try to build I just get the yes.

checking whether g++ accepts -std=c++11... yes
= yes
...
= yes

looks like there is a cmake build. maybe that one works a little better.

Thanks for testing, it looks like a typo in configure.ac. Will patch (I'd rather keep the autotools build).

@collares
Copy link
Member Author

collares commented Jan 1, 2025

Patched, but I wonder if this means that the --with-ntl option is fully untested.

@paparodeo
Copy link
Contributor

Patched, but I wonder if this means that the --with-ntl option is fully untested.

https://github.com/flintlib/flint/blob/c0a82ba84f4caf803dcf400719c19162a770e763/.github/workflows/CI.yml#L170

@collares
Copy link
Member Author

collares commented Jan 1, 2025

Ah, but that one has --disable-debug, and the configure bug requires debugging enabled (the default) and --with-ntl. Should we really be shipping FLINT with debugging enabled by default?

@paparodeo
Copy link
Contributor

Ah, but that one has --disable-debug, and the configure bug requires debugging enabled (the default) and --with-ntl. Should we really be shipping FLINT with debugging enabled by default?

seems like they get stripped off regardless of the flag. sage built for me on linux with this pr. darwin needs more work.

@collares
Copy link
Member Author

collares commented Jan 1, 2025

I'm going to merge this soon to fix the Linux build, then. Feel free to tag me on Darwin follow-ups if you find the time to continue investigating. Thanks!

@collares collares merged commit 85d6d1b into NixOS:master Jan 1, 2025
@collares collares deleted the flint-reserved branch January 1, 2025 18:19
preConfigurePhase = ''
preConfigure = ''
# the following configure.ac fix is only needed for flint 3.1.X
sed -i 's/if "$ac_cv_prog_cxx_g" = "yes"/if test "$ac_cv_prog_cxx_g" = "yes"/' configure.ac
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstreamed at flintlib/flint#2132

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants