Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: ac0c250ce361
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 13904b44e368
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 24, 2018

  1. Revert "meson: 0.46.1 -> 0.47.0" 

    With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4d.

(cherry picked from commit 273d68e)
Signed-off-by: Domen Kožar <domen@dev.si>
    @dtzWill @domenkozar
    dtzWill authored and domenkozar committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    13904b4 View commit details
    Browse the repository at this point in the history