root: make rootcint and genreflex available again#437927
root: make rootcint and genreflex available again#437927veprbl merged 2 commits intoNixOS:masterfrom
Conversation
nixpkgs-ci
bot
added
10.rebuild-linux: 11-100
veprbl
left a comment
veprbl
left a comment
There was a problem hiding this comment.
Thanks for looking into this. Would be nice to see this adopted upstream.
| @@ -135,6 +135,8 @@ stdenv.mkDerivation rec { | |||
| hash = "sha256-D7LZWJnGF9DtKcM8EF3KILU81cqTcZolW+HMe3fmXTw="; | |||
| revert = true; | |||
| }) | |||
| # Will also be integrated to ROOT 6.38.00 | |||
| ./Build-rootcint-and-genreflex-as-separate-targets.patch | |||
There was a problem hiding this comment.
Please use fetchpatch2, it should be fine to refer to a commit within unmerged upstream PR by sha.
| + | ||
| +# To inherit the dependencies from rootcling | ||
| +add_dependencies(genreflex rootcling) | ||
| +add_dependencies(rootcint rootcint) |
There was a problem hiding this comment.
There was a comment about this upstream. We can fetchpatch updated version instead.
There was a problem hiding this comment.
Ah cool! Yes that's true. Sorry I forgot about the upstream PR, I'll follow up there
There was a problem hiding this comment.
The upstream commit has been merged!
But sorry, fetchpatch can't be used, because of merge conflicts in the commit when trying to apply it to the 6.36 release.
guitargeek
force-pushed
the
root_apfelgrid_fix
branch
from
e115c94 to
56bc281
Compare
The mechanism to install these binaries as hard links to `rootcling` was quite fragile. This commit suggests to just build them as separate CMake targets instead. This fixes the compilation of `applgrid, `apfelgrid`, and `xfitter` reported in NixOS#424032 (comment)
guitargeek
force-pushed
the
root_apfelgrid_fix
branch
from
56bc281 to
2d6a109
Compare
This commit is analogous to 4ae54c3, which did the same change to `gfal2`.
|
@veprbl, the upstream commit to ROOT was now merged. Locally, I can build Is this PR okay for you now? Thanks for reviewing! |
nixpkgs-ci
bot
removed
the
11.by: package-maintainer
nixpkgs-ci
bot
added
12.approvals: 1
|
@veprbl, can this be merged? Thanks! |
2 participants
The mechanism to install these binaries as hard links to
rootclingwas quite fragile. This commit suggests to just build them as separate CMake targets instead.This fixes the compilation of
applgrid,apfelgrid, andxfitterreported in #424032 (comment)FYI @veprbl
Upstream commit to ROOT:
rootcintandgenreflexas separate targets root-project/root#19769