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

libgme: Don't reference gcc-unwrapped #89324

Merged
merged 1 commit into from
Jun 4, 2020
Merged

libgme: Don't reference gcc-unwrapped #89324

merged 1 commit into from
Jun 4, 2020
+11 −1

Conversation

doronbehar
Copy link
Contributor

@doronbehar doronbehar commented Jun 1, 2020 •
edited
Loading

Motivation for this change

Fix #88953 - make it not reference gcc-unwrapped.

Things done

I don't know why it references gcc-unwrapped, but this patch fixes it. Something in the compilation makes the libraries have the strings:

/gcc/include/c++/9.3.0/bits/stl_vector.h
/gcc/include/c++/9.3.0/ext/new_allocator.h
/gcc/include/c++/9.3.0/bits/alloc_traits.h
/gcc/include/c++/9.3.0/bits/vector.tcc
/gcc/include/c++/9.3.0/bits/stl_uninitialized.h
/gcc/include/c++/9.3.0/bits/stl_algobase.h
/gcc/include/c++/9.3.0/bits/allocator.h
/gcc/include/c++/9.3.0/bits/stl_construct.h

I'm not sure how to actually test that e.g gst-plugins-bad is still working. @lheckemann since you have contributed this package originally, perhaps do you know how to do that? I assume I need a certain media type but I'm not sure which...

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@ofborg ofborg bot requested a review from lheckemann June 1, 2020 19:58
@doronbehar doronbehar changed the base branch from master to staging June 3, 2020 13:57
@doronbehar doronbehar changed the base branch from staging to master June 3, 2020 13:57
@doronbehar
Copy link
Contributor Author

doronbehar commented Jun 3, 2020 •
edited
Loading

Should I change the base branch to staging? Doing so via the web interface makes GitHub think I'm pulling tons of other commits...

@ofborg ofborg bot added 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: policy discussion 6.topic: python 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ and removed 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: policy discussion 6.topic: python 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 labels Jun 3, 2020
@lheckemann
Copy link
Member

If you want to change the target to staging, I'd suggest rebasing to avoid the many-commits problem (this won't always work neatly, depending on the divergence between master and staging):
git fetch origin && git rebase --onto $(git merge-base origin/staging origin/master) origin/master. That said, I think under 500 rebuilds is still fine for master.

@doronbehar
Copy link
Contributor Author

@GrahamcOfBorg build libgme

@doronbehar doronbehar changed the base branch from master to staging June 3, 2020 15:52
@doronbehar
Copy link
Contributor Author

If you want to change the target to staging, I'd suggest rebasing to avoid the many-commits problem (this won't always work neatly, depending on the divergence between master and staging):
git fetch origin && git rebase --onto $(git merge-base origin/staging origin/master) origin/master. That said, I think under 500 rebuilds is still fine for master.

Yea I think it'll be a bit nicer.

I've also fixed the Darwin build.

@doronbehar doronbehar force-pushed the libgme-gcc-ref branch 2 times, most recently from 7c73a34 to 9feef7b Compare June 3, 2020 16:50
@doronbehar
Copy link
Contributor Author

@GrahamcOfBorg eval

@GrahamcOfBorg build libgme

@doronbehar
libgme: Don't reference gcc-unwrapped

Verified

This commit was signed with the committer’s verified signature.
renovate-bot Mend Renovate
GPG key ID: 81C63AE1C224182B
Verified
Learn about vigilant mode
cf657dc
@ofborg ofborg bot requested a review from lheckemann June 3, 2020 17:47
@lheckemann
Copy link
Member

The darwin build doesn't seem to be happening, but this does seem to be fine — I'll test playing back some SNES SPC files with audacious to make sure and then merge.

@lheckemann lheckemann merged commit 073c37e into NixOS:staging Jun 4, 2020
@doronbehar
Copy link
Contributor Author

Thanks!

@doronbehar doronbehar deleted the libgme-gcc-ref branch March 2, 2023 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pbogdan pbogdan

@symphorien symphorien

@lheckemann lheckemann

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

libgme references gcc-unwrapped
4 participants
@doronbehar @lheckemann @pbogdan @symphorien