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

root: 6.08.02 -> 6.09.02 #25231

Merged
merged 2 commits into from May 20, 2017
Merged

root: 6.08.02 -> 6.09.02 #25231

merged 2 commits into from May 20, 2017

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Apr 26, 2017

This also fixes breakage on darwin due to LLVM4.0 migration.

I had to enable opengl because otherwise macOS build is broken.
See root commit 23f8871c7 ('Do not include OpenGL directly but use our
TGLIncludes for that purpose.')

I've enabled xml because TUnfold now depends on it.

Motivation for this change

ROOT is currently broken on darwin.

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.

#24294

@mention-bot
Copy link

@veprbl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @sprock, @vcunat and @peti to be potential reviewers.

url = "https://sft.its.cern.ch/jira/secure/attachment/20025/0001-std-string_view-has-no-more-to_string.patch";
sha256 = "0ngyk960xfrcsj4vhr1ax8h85fx0g1cfycxi3k35a6ych2zmyg8q";
})
./ROOT-8728-extra.patch
Copy link
Member

@Mic92 Mic92 Apr 26, 2017

Choose a reason for hiding this comment

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

this patch was not available for as download, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, this one I had to make myself.

There is a certain commit in root-project/root#522 which might have a similar effect. But that commit is not permanently stored on github and can be removed at any moment. Also their approach is to mark operator std::string_view() as explicit which might or might not be accepted. The way I do my patching will force user to do explicit conversions, which should be always forward-compatible with future possible upstream. This is because it will not allow to write code that won't be compatible if the explicit-based solution is not accepted.

If you want, I can publish my patch as a gist and never delete it. Or I can try to put it on their bugtracker, I hope they won't mind :)

@veprbl veprbl force-pushed the root_6.09.02 branch 2 times, most recently from 246e66d to 664294a Compare April 26, 2017 20:33
This also fixes breakage on darwin due to LLVM4.0 migration.

I had to enable opengl because otherwise macOS build is broken.
See root commit 23f8871c7 ('Do not include OpenGL directly but use our
TGLIncludes for that purpose.')

I've enabled xml because TUnfold depends on it.
@Mic92 Mic92 merged commit ea706bd into NixOS:master May 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants