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.

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

boehm-gc, libatomic_ops: 7.6.0 -> 7.6.2 #33810

Merged
merged 1 commit into from Jan 13, 2018
Merged

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jan 12, 2018

Motivation for this change

boehm-gc: https://github.com/ivmai/bdwgc/releases/tag/v7.6.2
libatomic_ops: https://github.com/ivmai/libatomic_ops/releases/tag/v7.6.2

Large number of fixes and (apparently) 7.6.0 was only a "pre-release".

Things done
  • 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.

@Mic92
Copy link
Member

Mic92 commented Jan 13, 2018

Maybe move to staging?

These should be the same version.
@dtzWill dtzWill changed the base branch from master to staging January 13, 2018 15:37
@dtzWill
Copy link
Member Author

dtzWill commented Jan 13, 2018

Warrgarbl, sorry for "requested review". I rebased onto staging locally, pushed, then changed PR target here-- is there a better way?

(I suppose I could close the PR and open a new one against staging?)

@dtzWill
Copy link
Member Author

dtzWill commented Jan 13, 2018

7.6.2 also fixes out-of-the-box support with musl 😁

@Mic92
Copy link
Member

Mic92 commented Jan 13, 2018

@GrahamcOfBorg build boehm-gc libatomic_ops

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failure for system: x86_64-darwin

error: attribute 'boehm-gc' in selection path 'boehm-gc' not found

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failure for system: aarch64-linux

error: attribute 'boehm-gc' in selection path 'boehm-gc' not found

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failure for system: x86_64-linux

error: attribute ‘boehm-gc’ in selection path ‘boehm-gc’ not found

@Mic92
Copy link
Member

Mic92 commented Jan 13, 2018

@GrahamcOfBorg build boehmgc libatomic_ops

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: aarch64-linux

patching script interpreter paths in /nix/store/fg4jncx2xx7j4phch6pifv6l7rpqwj3q-boehm-gc-7.6.2-dev
checking for references to /build in /nix/store/fg4jncx2xx7j4phch6pifv6l7rpqwj3q-boehm-gc-7.6.2-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/8hxka7w7nx53gljrmy0g7sbflks82083-boehm-gc-7.6.2-doc
patching script interpreter paths in /nix/store/8hxka7w7nx53gljrmy0g7sbflks82083-boehm-gc-7.6.2-doc
checking for references to /build in /nix/store/8hxka7w7nx53gljrmy0g7sbflks82083-boehm-gc-7.6.2-doc...
shrinking RPATHs of ELF executables and libraries in /nix/store/brccnw8rlnkp5jac88aqv9k50svw6pyf-boehm-gc-7.6.2-debug
patching script interpreter paths in /nix/store/brccnw8rlnkp5jac88aqv9k50svw6pyf-boehm-gc-7.6.2-debug
checking for references to /build in /nix/store/brccnw8rlnkp5jac88aqv9k50svw6pyf-boehm-gc-7.6.2-debug...
/nix/store/ws93nk9cm6a35phfi1d7r8n2v5zmxjiz-boehm-gc-7.6.2
/nix/store/5gs41bqg580yl1bcyvacdszyhfbzzxvz-libatomic_ops-7.6.2

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-darwin

strip is /nix/store/3nd5b9lhyhzn4vc5gippii8pq189p6wa-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/35q96adywqk8qzrgspq9axi35psc5p5a-boehm-gc-7.6.2/lib
patching script interpreter paths in /nix/store/35q96adywqk8qzrgspq9axi35psc5p5a-boehm-gc-7.6.2
strip is /nix/store/3nd5b9lhyhzn4vc5gippii8pq189p6wa-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/6fykwv98vag7aj9dqa5c04m9r1p452iw-boehm-gc-7.6.2-dev/lib
patching script interpreter paths in /nix/store/6fykwv98vag7aj9dqa5c04m9r1p452iw-boehm-gc-7.6.2-dev
strip is /nix/store/3nd5b9lhyhzn4vc5gippii8pq189p6wa-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/kkh43xhzrxkvp20f9hn4mfqc2iz2laf5-boehm-gc-7.6.2-doc
/nix/store/35q96adywqk8qzrgspq9axi35psc5p5a-boehm-gc-7.6.2
/nix/store/2rv4ncrcb3yxla3sx57mib02q81cjyvp-libatomic_ops-7.6.2

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-linux

patching script interpreter paths in /nix/store/5qfjn7ydmi83s74rn3i6yic7sp07r7dk-boehm-gc-7.6.2-dev
checking for references to /tmp/nix-build-boehm-gc-7.6.2.drv-0 in /nix/store/5qfjn7ydmi83s74rn3i6yic7sp07r7dk-boehm-gc-7.6.2-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/hx85mch4kfg14w4pawxv6vzm26yi9704-boehm-gc-7.6.2-doc
patching script interpreter paths in /nix/store/hx85mch4kfg14w4pawxv6vzm26yi9704-boehm-gc-7.6.2-doc
checking for references to /tmp/nix-build-boehm-gc-7.6.2.drv-0 in /nix/store/hx85mch4kfg14w4pawxv6vzm26yi9704-boehm-gc-7.6.2-doc...
shrinking RPATHs of ELF executables and libraries in /nix/store/xnrk9n67f9h04fymrn5228dmgcnxfn0x-boehm-gc-7.6.2-debug
patching script interpreter paths in /nix/store/xnrk9n67f9h04fymrn5228dmgcnxfn0x-boehm-gc-7.6.2-debug
checking for references to /tmp/nix-build-boehm-gc-7.6.2.drv-0 in /nix/store/xnrk9n67f9h04fymrn5228dmgcnxfn0x-boehm-gc-7.6.2-debug...
/nix/store/gxin75ai9hj29var6k5pb3kq76lpw2b8-boehm-gc-7.6.2
/nix/store/yk5ppgh875va5h4gbnbqy4wy5ln7x5qm-libatomic_ops-7.6.2

@Mic92 Mic92 merged commit 302dfcd into NixOS:staging Jan 13, 2018
@vbgl
Copy link
Contributor

vbgl commented Jan 26, 2018

This breaks asymptote on darwin:

clang++ -Wall -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -DUSEGC  -D_THREAD_SAFE -pthread -DFFTWPP_SINGLE_THREAD  -std=c++11 -g -O3 -I. -I/nix/store/s9p77paw85dcs0bp1n48s12cha309czy-asymptote-2.41/include/gc -I/usr/include/gc -o settings.o -c settings.cc
In file included from settings.cc:18:
In file included from ./common.h:35:
In file included from ./memory.h:13:
/nix/store/942hw6bhnppjqy7szdyfrr0fiiaj7818-libc++-4.0.1/include/c++/v1/map:1577:27: error: no matching member function for call to 'select_on_container_copy_construction'
          __alloc_traits::select_on_container_copy_construction(__m.__tree_.__alloc()))
          ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./memory.h:146:14: note: in instantiation of member function 'std::__1::multimap<const sym::symbol, trans::tyEntry *, std::__1::less<const sym::symbol>, gc_allocator<std::__1::pair<const sym::symbol, trans::tyEntry *> > >::multimap' requested here
GC_CONTAINER(multimap);
             ^
./env.h:61:8: note: in instantiation of member function 'sym::table<trans::tyEntry *>::collapseScope' requested here
    te.collapseScope(); ve.collapseScope();
       ^
/nix/store/942hw6bhnppjqy7szdyfrr0fiiaj7818-libc++-4.0.1/include/c++/v1/memory:1582:9: note: candidate function not viable: no known conversion from 'gc_allocator<std::__1::__value_type<const sym::symbol, trans::tyEntry *>>' to 'const gc_allocator<std::__1::pair<const sym::symbol, trans::tyEntry *>>' for 1st argument
        select_on_container_copy_construction(const allocator_type& __a)
        ^
/nix/store/942hw6bhnppjqy7szdyfrr0fiiaj7818-libc++-4.0.1/include/c++/v1/memory:1723:9: note: candidate function not viable: requires 2 arguments, but 1 was provided
        select_on_container_copy_construction(true_type, const allocator_type& __a)
        ^
/nix/store/942hw6bhnppjqy7szdyfrr0fiiaj7818-libc++-4.0.1/include/c++/v1/memory:1727:9: note: candidate function not viable: requires 2 arguments, but 1 was provided
        select_on_container_copy_construction(false_type, const allocator_type& __a)
        ^
1 error generated.
make: *** [Makefile:318: settings.o] Error 1

@dtzWill
Copy link
Member Author

dtzWill commented Jan 26, 2018 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants