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

boost167: Add lockfree next_prior patch #43313

Merged
merged 1 commit into from Jul 21, 2018
Merged

boost167: Add lockfree next_prior patch #43313

merged 1 commit into from Jul 21, 2018

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Jul 11, 2018

Motivation for this change

Fix spsc_queue.hpp missing include of next_prior.hpp

cc: @anttih

Closes #43118

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@joachifm joachifm requested a review from dtzWill July 11, 2018 09:45
@joachifm
Copy link
Contributor

Is it possible to get the patch from an external source rather than checking it in?

Also you might consider changing the base branch to staging.

@marsam marsam changed the base branch from master to staging July 14, 2018 21:16
@marsam
Copy link
Contributor Author

marsam commented Jul 14, 2018

Is it possible to get the patch from an external source rather than checking it in?

we can get it from boostorg/lockfree@12726cd, but because the path is different from the distributed tarball, will also involved calling patch in postPatch, and boost/generic.nix to accept postPatch

@joachifm
Copy link
Contributor

@GrahamcOfBorg build boost167

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: boost167

Partial log (click to expand)

shrinking /nix/store/bx5l2kx3ks4zmxgrgdrq5saddnkiysr0-boost-1.67_0/lib/libboost_atomic.so.1.67.0
strip is /nix/store/h0nc84ybvb8g724fwysvcghh1675wjli-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bx5l2kx3ks4zmxgrgdrq5saddnkiysr0-boost-1.67_0/lib
patching script interpreter paths in /nix/store/bx5l2kx3ks4zmxgrgdrq5saddnkiysr0-boost-1.67_0
checking for references to /build in /nix/store/bx5l2kx3ks4zmxgrgdrq5saddnkiysr0-boost-1.67_0...
shrinking RPATHs of ELF executables and libraries in /nix/store/8h8ynaw2ydfmgighf61idbjcfw91axgh-boost-1.67_0-dev
strip is /nix/store/h0nc84ybvb8g724fwysvcghh1675wjli-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/8h8ynaw2ydfmgighf61idbjcfw91axgh-boost-1.67_0-dev
checking for references to /build in /nix/store/8h8ynaw2ydfmgighf61idbjcfw91axgh-boost-1.67_0-dev...
/nix/store/bx5l2kx3ks4zmxgrgdrq5saddnkiysr0-boost-1.67_0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: boost167

Partial log (click to expand)

shrinking /nix/store/0dsn3w1kblpap24m1dbcllbdsbq930pw-boost-1.67_0/lib/libboost_coroutine.so.1.67.0
strip is /nix/store/fzsyclvxz1p2ia83caniy93v8cwarg0j-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0dsn3w1kblpap24m1dbcllbdsbq930pw-boost-1.67_0/lib 
patching script interpreter paths in /nix/store/0dsn3w1kblpap24m1dbcllbdsbq930pw-boost-1.67_0
checking for references to /tmp/nix-build-boost-1.67_0.drv-0 in /nix/store/0dsn3w1kblpap24m1dbcllbdsbq930pw-boost-1.67_0...
shrinking RPATHs of ELF executables and libraries in /nix/store/n4lcqa7zsq578x0q6b7dsb1xxawaxix7-boost-1.67_0-dev
strip is /nix/store/fzsyclvxz1p2ia83caniy93v8cwarg0j-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/n4lcqa7zsq578x0q6b7dsb1xxawaxix7-boost-1.67_0-dev
checking for references to /tmp/nix-build-boost-1.67_0.drv-0 in /nix/store/n4lcqa7zsq578x0q6b7dsb1xxawaxix7-boost-1.67_0-dev...
/nix/store/0dsn3w1kblpap24m1dbcllbdsbq930pw-boost-1.67_0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: boost167

Partial log (click to expand)

cannot build derivation '/nix/store/6w2pfix7kgz8winpm2fni2kawkvcl2wd-cctools-binutils-darwin-wrapper.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/h2mrcyjjwyyl0sn8k5g9q6fj1v6q0rr1-clang-wrapper-5.0.2.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/790pjx4mmjr1mgabh3f4x8fqn7dwll5n-stdenv-darwin.drv': 35 dependencies couldn't be built
cannot build derivation '/nix/store/78bi80i5dn6sz3a7gs3j1jlr1jn0jl3c-hook.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/xs0j0a25q2dya99hh0gg3mrgzg3a3d1i-stdenv-darwin.drv': 36 dependencies couldn't be built
cannot build derivation '/nix/store/aybf4kag5nrqq19axagax5w1n2fpcg6f-expat-2.2.5.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/74qj6k60zji1sgspm0262c62kllsadln-icu4c-59.1.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/z9gdrjdzyrrv58pqr6bhxmmlq7gxbsr7-which-2.21.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/862wqsdgxpnmpykfz06mg941rszjrlx1-boost-1.67_0.drv': 10 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/862wqsdgxpnmpykfz06mg941rszjrlx1-boost-1.67_0.drv' failed

@vbgl
Copy link
Contributor

vbgl commented Jul 20, 2018

@marsam You can use the stripLen argument to fetchpatch:

+  patches = [ (fetchpatch {
+    url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
+    sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
+    stripLen = 1;
+  })];

@marsam marsam force-pushed the feature/boost167-add-lockfree-patch branch from 1a6bb26 to 845d459 Compare July 21, 2018 04:09
@marsam
Copy link
Contributor Author

marsam commented Jul 21, 2018

@vbgl cool! I didn't know about stripLen

@vbgl
Copy link
Contributor

vbgl commented Jul 21, 2018

@GrahamcOfBorg build mpd

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: mpd

Partial log (click to expand)

cannot build derivation '/nix/store/038ccqndard5p6z484qq4m2an9w6yn7y-apple-framework-CoreMedia.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/c28rcv0200gim0maa86z6gchc1mkxvp5-libass-0.14.0.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/9ypisy6lzxf0fbsh3hlzb8wycw73cqi4-libsndfile-1.0.28.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/88qyip1mhrqaa1z54j4r9kqdwbdr5f07-apple-framework-Cocoa.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/cjca87v2f6hvg4mz9c4mybxx5q0pk4fv-fluidsynth-1.1.10.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/hlyc559dmzyl6xynkq0g8r6vzw3ikldg-libsamplerate-0.1.9.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/qvsj0kxl4g0plvraxiq3x660jrmm0bvb-SDL2-2.0.8.drv': 21 dependencies couldn't be built
cannot build derivation '/nix/store/7asknq6f3mdzwd2is1cqfhb1pmfaabxm-ffmpeg-3.4.3.drv': 23 dependencies couldn't be built
cannot build derivation '/nix/store/1rfghxhcfpq6frmnkfp84y7fi1693q17-mpd-0.20.20.drv': 29 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/1rfghxhcfpq6frmnkfp84y7fi1693q17-mpd-0.20.20.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: mpd

Partial log (click to expand)

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/m713fx1x5ymbpmykfm0nvbc12c1qw5xz-mpd-0.20.20
shrinking /nix/store/m713fx1x5ymbpmykfm0nvbc12c1qw5xz-mpd-0.20.20/bin/mpd
gzipping man pages under /nix/store/m713fx1x5ymbpmykfm0nvbc12c1qw5xz-mpd-0.20.20/share/man/
strip is /nix/store/fzsyclvxz1p2ia83caniy93v8cwarg0j-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/m713fx1x5ymbpmykfm0nvbc12c1qw5xz-mpd-0.20.20/bin
patching script interpreter paths in /nix/store/m713fx1x5ymbpmykfm0nvbc12c1qw5xz-mpd-0.20.20
checking for references to /build in /nix/store/m713fx1x5ymbpmykfm0nvbc12c1qw5xz-mpd-0.20.20...
/nix/store/m713fx1x5ymbpmykfm0nvbc12c1qw5xz-mpd-0.20.20

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: mpd

Partial log (click to expand)

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/hcfdkf3n7pq8zk1f8y90bqpzmvziv1wh-mpd-0.20.20
shrinking /nix/store/hcfdkf3n7pq8zk1f8y90bqpzmvziv1wh-mpd-0.20.20/bin/mpd
gzipping man pages under /nix/store/hcfdkf3n7pq8zk1f8y90bqpzmvziv1wh-mpd-0.20.20/share/man/
strip is /nix/store/h0nc84ybvb8g724fwysvcghh1675wjli-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hcfdkf3n7pq8zk1f8y90bqpzmvziv1wh-mpd-0.20.20/bin
patching script interpreter paths in /nix/store/hcfdkf3n7pq8zk1f8y90bqpzmvziv1wh-mpd-0.20.20
checking for references to /build in /nix/store/hcfdkf3n7pq8zk1f8y90bqpzmvziv1wh-mpd-0.20.20...
/nix/store/hcfdkf3n7pq8zk1f8y90bqpzmvziv1wh-mpd-0.20.20

@vbgl vbgl merged commit ce408e8 into NixOS:staging Jul 21, 2018
@marsam marsam deleted the feature/boost167-add-lockfree-patch branch July 21, 2018 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@marsam @joachifm @GrahamcOfBorg @vbgl