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

cvc3: fix build against bison 3.7 #98498

Merged
merged 2 commits into from Sep 23, 2020
Merged

cvc3: fix build against bison 3.7 #98498

merged 2 commits into from Sep 23, 2020

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Sep 22, 2020 •
edited

Motivation for this change

ZHF: #97479

This was broken by the recent switch from bison 3.6 to 3.7. For some reason bison 3.7 output references $x_defs.h files under the name $x.hpp.

This sort-of-but-doesn't-really seem to correspond to changes documented in the changelog under "C++ file names" https://git.savannah.gnu.org/cgit/bison.git/tree/NEWS?h=v3.7.1#n169

Anyway, here we work around this by creating symlinks to make this happy.

Also enable for darwin while we're at it, because it works if switched to gcc. Tested macos 10.14.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@risicle
cvc3: fix build against bison 3.7
e2743e0 
for some reason bison 3.7 output references $x_defs.h files under the name
$x.hpp. create symlinks to make this work.
@risicle
cvc3: enable for darwin
4c3a1e9 
it may be possible to get it building under clang with some work, but
switching it to gcc for now allows us to enable it
@ofborg ofborg bot requested a review from 7c6f434c September 22, 2020 21:55
jonringer
jonringer approved these changes Sep 23, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 98498 1

2 packages built:
  • cvc3
  • tlaps

@jonringer jonringer merged commit fc709e6 into NixOS:master Sep 23, 2020
@risicle risicle mentioned this pull request Sep 23, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@risicle @jonringer