llvmPackages_14.openmp: unbreak#163868
Conversation
|
Looks like others need fixing too, see #162423 . Especially |
a82f397 to
a122d38
Compare
a122d38 to
2efcc3e
Compare
|
(force-push'ing after rebasing onto master, and -rc updates before that) |
|
github.com/Ericson2314/llvm-project has the commits I made by patches from, but I would rebase them so it is unclear whether we have enough to stuff for prior releases from there :(. |
|
@dtzWill Did you just remove parts of the patch that already were applied, or what? |
That's what it ended up being, yes, I think. Not how I went about it but yes, applied and seemed safe to drop bits that were already applied (since seemed you were upstreaming things). The rest still seem useful, and seem to be needed (and doing what they seem intended to). Bummer about the patches rebase'd and maybe lost from around the branch-off. These things happen, but ugh sorry. How do you want to handle this, then? (don't suppose you have a super high What we have here (openmp) doesn't seem super broken (bits all end up in expected places, compared to openmp13 -- includes are almost entirely the same, etc.), but I haven't checked the produced cmake bits all work (esp across multiple outputs). Haven't sorted what a good test might be, since our in-tree users are Darwin or a clangStdenv (so can't just point nixpkgs-review at it or something :)). The other bits (the other subprojects) I/we might need (or really appreciate at the least) some help with. Can you take a look? Or is there a way to check things work as expected? BTW I've done a hopefully-not-too-rough attempt at packaging up MLIR and flang over here: #163878 . I noticed your github has a gnu installdirs for MLIR (5ad96992ef909e6b99d8c693a285f06c9fc645fe), is any of that needed? To fix libraries being installed in the wrong location, I addressed it same as in another patch (but I don't see that in your commit). Well anyway, this can be discussed over in that PR if you have time/are interested 😄. |
|
Result of 1 package built:
|
|
@dtzWill is the issue that the GNU install dirs LLVM patches only contain too much stuff, or do they sometimes not contain enough stuff? If just tthe former I might have reflog, but honestly I would just start with what's in Nixpkgs as more of a known-good state. |
|
Also note I did save the original backports in |
Description of changes
Fixup old patches causing OpenMP to be marked broken,
one of which can be removed in favor of pointing the build
at the required tools directly.
Mostly get tests working, but few failures I haven't tracked down
caused me to ultimately disable them for now.
Help testing or pointing to something that should work on Linux with
this is appreciated :).
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes