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.

Sign up for GitHub

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

Jump to bottom

xfsprogs: replace glibc-2.27 patch w/upstream variant #37888

Merged
merged 1 commit into from
Mar 26, 2018
Merged

xfsprogs: replace glibc-2.27 patch w/upstream variant #37888

merged 1 commit into from
Mar 26, 2018
+41 −25

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 26, 2018

This version also works w/musl :)

https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/patch/?id=8041435de7ed028a27ecca64302945ad455c69a6

cc @shlevy

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • 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.

Sorry, something went wrong.

@dtzWill dtzWill requested a review from shlevy March 26, 2018 19:55
@dezgeg
Copy link
Contributor

dezgeg commented Mar 26, 2018

Maybe just upgrade the package instead?

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018 •
edited
Loading

Optimistically moving ahead, just wanted to make sure you saw :). Hopefully uncontroversial since we're using upstream fix :)

EDIT: nevermind, didn't see discussion.

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

(I suspect that fix didn't exist when you were working on this, hehe)

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500 labels Mar 26, 2018
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: xfsprogs

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: xfsprogs

Partial log (click to expand)

shrinking /nix/store/n645c3nkbaqbcwscdwajwjz6bhsingw1-xfsprogs-4.14.0/lib/libxlog.so.0.0.0
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/n645c3nkbaqbcwscdwajwjz6bhsingw1-xfsprogs-4.14.0/lib
patching script interpreter paths in /nix/store/n645c3nkbaqbcwscdwajwjz6bhsingw1-xfsprogs-4.14.0
checking for references to /tmp/nix-build-xfsprogs-4.14.0.drv-0 in /nix/store/n645c3nkbaqbcwscdwajwjz6bhsingw1-xfsprogs-4.14.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/v39s40qxxia6wcrj9n8gapag1lll7bjw-xfsprogs-4.14.0-doc
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/v39s40qxxia6wcrj9n8gapag1lll7bjw-xfsprogs-4.14.0-doc
checking for references to /tmp/nix-build-xfsprogs-4.14.0.drv-0 in /nix/store/v39s40qxxia6wcrj9n8gapag1lll7bjw-xfsprogs-4.14.0-doc...
/nix/store/wy4z3a0pln196777q00brv4bnzicbisj-xfsprogs-4.14.0-bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: xfsprogs

Partial log (click to expand)

shrinking /nix/store/0l9hhrida7vwh704606iv8zl6a34n1dc-xfsprogs-4.14.0/lib/libxfs.so.0.0.0
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0l9hhrida7vwh704606iv8zl6a34n1dc-xfsprogs-4.14.0/lib
patching script interpreter paths in /nix/store/0l9hhrida7vwh704606iv8zl6a34n1dc-xfsprogs-4.14.0
checking for references to /build in /nix/store/0l9hhrida7vwh704606iv8zl6a34n1dc-xfsprogs-4.14.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/sq08600cna79p4cwmab2fzl6bfj0xj5f-xfsprogs-4.14.0-doc
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/sq08600cna79p4cwmab2fzl6bfj0xj5f-xfsprogs-4.14.0-doc
checking for references to /build in /nix/store/sq08600cna79p4cwmab2fzl6bfj0xj5f-xfsprogs-4.14.0-doc...
/nix/store/w4hiynajhwk287nrx9f1f7xpw2wv2wsh-xfsprogs-4.14.0-bin

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

Maybe just upgrade the package instead?

I tried that first but had problems making it work (4.15.1) regardless of libc. Note there are newer gentoo patches to use but even so.

Here's about where I left that effort, if anyone wants to revisit it in the future: https://github.com/dtzWill/nixpkgs/releases/tag/xfsprogs-4.15.1-wip

It fails trying to--I guess-- find Makefile rules for LDFLAGS-esque things like -lrt or -lunistring. Not sure what's going on there.

While visiting this I'll note other folks seem to build with DEBUG=-NDEBUG which we may wish to do as well, but I was only going to explore that after the update worked.... :).

@shlevy
Copy link
Member

shlevy commented Mar 26, 2018

🚢 Yeah, this wasn't upstream when I looked for it.

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2018

And, err, ignore the rest of that tree's commits 😇 haha they're from some exploratory dev haha.

@dezgeg
Copy link
Contributor

dezgeg commented Mar 26, 2018

Ok, thanks for the work on the upgrade, I will continue on that some day. For some reason xfsprogs always needs some patches to actually compile... it's like linking dynamically to stuff in 2018 is rocket science or something...

@dtzWill dtzWill merged commit 332c90b into NixOS:staging Mar 26, 2018
@dtzWill dtzWill deleted the fix/xfsprogs-use-upstream-patch branch March 26, 2018 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shlevy shlevy

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtzWill @dezgeg @GrahamcOfBorg @shlevy