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

Jump to bottom

mariadb: fix clang and darwin build #62777

Merged
merged 1 commit into from Jun 6, 2019
Merged

mariadb: fix clang and darwin build #62777

merged 1 commit into from Jun 6, 2019

Conversation

thefloweringash
Copy link
Member

The contents of clang-isfinite.patch are no longer necessary after
upstream revision 031fa6d4258574379ca3c1cbe912d235e9581982, which
includes a similar change.

Building in c++11 mode removes support for the GCC typeof extension
in favor of the standardized __typeof__. This causes errors when
using the strmake_buf macro, which relies on typeof.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@thefloweringash
mariadb: fix clang and darwin build
b8a6649 
The contents of `clang-isfinite.patch` are no longer necessary after
upstream revision 031fa6d4258574379ca3c1cbe912d235e9581982, which
includes a similar change.

Building in c++11 mode removes support for the GCC `typeof` extension
in favor of the standardized `__typeof__`. This causes errors when
using the `strmake_buf` macro, which relies on `typeof`.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jun 6, 2019
@thefloweringash
Copy link
Member Author

I don't know if the .so / .dylib renaming here is correct. @Izorkin would you be able to check this part?

@ofborg ofborg bot requested a review from thoughtpolice June 6, 2019 15:52
@matthewbauer matthewbauer merged commit 73679b5 into NixOS:master Jun 6, 2019
@Izorkin
Copy link
Contributor

Izorkin commented Jun 6, 2019

@thefloweringash seems to be right

@thefloweringash thefloweringash deleted the mariadb-clang branch June 6, 2019 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thefloweringash @Izorkin @matthewbauer