Skip to content

ghdl: use gnat11 to unbreak build#184352

Merged
SuperSandro2000 merged 3 commits intomasterfrom
unknown repository
Aug 3, 2022
Merged

ghdl: use gnat11 to unbreak build#184352
SuperSandro2000 merged 3 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Jul 31, 2022

Description of changes

Our ghdl is currently broken because ghdl-1.0.0 does not build with gnat12. The fixes appear to be upstream, but are spread across several patches. I tried cherry-picking the following:

... but eventually ran up against a failure in a file which had been deleted from upstream prior to their "fix gnat12" push, so there is no simple cherry-pick.

Let's fall back to gnat11 until we can update to a newer ghdl.

Things done
  • Built on platform(s)
    • x86_64-linux
  • 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/)
  • Fits CONTRIBUTING.md.

ghdl-1.0.0 does not build with gnat12.  The fixes appear to be
upstream, but are spread across several patches.  I tried
cherry-picking the following:

  https://github.com/ghdl/ghdl/pull/2057/commits/4c3825daf54f81433e5de46cc25fdfac7189ffab.patch
  https://github.com/ghdl/ghdl/pull/2057/commits/8c5689b93e68ac34cdf7dd089a3990ae22f0049c.patch
  https://github.com/ghdl/ghdl/commit/f8b87697e8b893b6293ebbfc34670c32bfb49397.patch
  https://github.com/ghdl/ghdl/commit/54a18dda071449e80982da9e31be4685da30f0ed.patch

... but eventually ran up against a failure in a file which had been
deleted from upstream prior to their "fix gnat12" push, so there is no
simple cherry-pick.

Let's fall back to gnat11 until we can update to a newer ghdl.
@ofborg ofborg bot requested review from Lucus16 and thoughtpolice July 31, 2022 22:10
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 31, 2022
@Lucus16
Copy link
Copy Markdown
Contributor

Lucus16 commented Aug 1, 2022

Is there a reason we can't update to a newer ghdl right now? I see version 2.0.0 has been released a few months ago.

Copy link
Copy Markdown
Contributor

@Lucus16 Lucus16 left a comment

Choose a reason for hiding this comment

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

I tried it for a bit, but updating to ghdl 2.0.0 does not seem trivial so this seems like a fine solution.

@Lucus16
Copy link
Copy Markdown
Contributor

Lucus16 commented Aug 1, 2022

Or actually, updating to ghdl 2.0.0 is trivial but still needs gnat11.

@ghost
Copy link
Copy Markdown
Author

ghost commented Aug 1, 2022

Or actually, updating to ghdl 2.0.0 is trivial but still needs gnat11.

Yeah that was my conclusion as well. Also I encountered some breakage in packages downstream of ghdl after the upgrade (yosys-ghdl, etc) but maybe there is an easy fix for it.

@ghost
Copy link
Copy Markdown
Author

ghost commented Aug 1, 2022

If you do bump the version please consider hanging on to ghdl_1_0_0 as a fallback option for at least a little while.

@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 2, 2022
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@bobby285271 bobby285271 removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 3, 2022
@ofborg ofborg bot requested a review from Lucus16 August 3, 2022 04:13
@SuperSandro2000 SuperSandro2000 merged commit 22a0a21 into NixOS:master Aug 3, 2022
@ghost ghost deleted the pr/ghdl/unbreak branch August 4, 2022 00:16
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-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants