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

meson: 0.35.0 -> 0.40.0 #25244

Merged
merged 2 commits into from Apr 27, 2017
Merged

meson: 0.35.0 -> 0.40.0 #25244

merged 2 commits into from Apr 27, 2017

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Apr 26, 2017

Motivation for this change

In configured builds other tools tries to call meson by directly
passing meson tools directly to python. Since they were shell scripts
due wrapping this failed. (tested with systemd new build system: https://github.com/systemd/systemd/)

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

In configured builds other tools tries to call meson by directly
passing meson tools directly to python. Since they were shell scripts
due wrapping this failed
@mention-bot
Copy link

@Mic92, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rasendubi, @sternenseemann and @brandonedens to be potential reviewers.

pushd $out/bin
# undo shell wrapper as meson tools are called with python
for i in *; do
mv ".$i-wrapped" "$i"
Copy link
Member Author

Choose a reason for hiding this comment

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

this looks hacky too me, but I did not find a better solution.

@Mic92 Mic92 merged commit 85add87 into NixOS:master Apr 27, 2017
@Mic92 Mic92 deleted the meson branch April 27, 2017 11:22
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.

None yet

2 participants