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

libgme: Don't reference gcc-unwrapped #89324

Merged
merged 1 commit into from Jun 4, 2020
Merged

Conversation

@doronbehar
Copy link
Contributor

doronbehar commented Jun 1, 2020

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.
@ofborg ofborg bot requested a review from lheckemann Jun 1, 2020
@doronbehar doronbehar force-pushed the doronbehar:libgme-gcc-ref branch from 7c25ad6 to ca7202f Jun 3, 2020
@doronbehar doronbehar changed the base branch from master to staging Jun 3, 2020
@doronbehar doronbehar changed the base branch from staging to master Jun 3, 2020
@doronbehar
Copy link
Contributor Author

doronbehar commented Jun 3, 2020

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

@lheckemann
Copy link
Member

lheckemann commented Jun 3, 2020

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

doronbehar commented Jun 3, 2020

@GrahamcOfBorg build libgme

@doronbehar doronbehar changed the base branch from master to staging Jun 3, 2020
@doronbehar doronbehar force-pushed the doronbehar:libgme-gcc-ref branch from ca7202f to ab02e1e Jun 3, 2020
@doronbehar
Copy link
Contributor Author

doronbehar commented Jun 3, 2020

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 doronbehar:libgme-gcc-ref branch 2 times, most recently from 7c73a34 to 9feef7b Jun 3, 2020
@doronbehar
Copy link
Contributor Author

doronbehar commented Jun 3, 2020

@GrahamcOfBorg eval

@GrahamcOfBorg build libgme

@doronbehar doronbehar force-pushed the doronbehar:libgme-gcc-ref branch from 9feef7b to cf657dc Jun 3, 2020
@ofborg ofborg bot requested a review from lheckemann Jun 3, 2020
@lheckemann
Copy link
Member

lheckemann commented Jun 4, 2020

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
17 of 18 checks passed
17 of 18 checks passed
libgme, libgme.passthru.tests on x86_64-darwin
Details
libgme.passthru.tests on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cf657dc"; rev="cf657dc584e296b629ac037aab583002b11166cf"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cf657dc"; rev="cf657dc584e296b629ac037aab583002b11166cf"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cf657dc"; rev="cf657dc584e296b629ac037aab583002b11166cf"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cf657dc"; rev="cf657dc584e296b629ac037aab583002b11166cf"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cf657dc"; rev="cf657dc584e296b629ac037aab583002b11166cf"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cf657dc"; rev="cf657dc584e296b629ac037aab583002b11166cf"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cf657dc"; rev="cf657dc584e296b629ac037aab583002b11166cf"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
libgme, libgme.passthru.tests on aarch64-linux Success
Details
libgme, libgme.passthru.tests on x86_64-linux Success
Details
@doronbehar
Copy link
Contributor Author

doronbehar commented Jun 4, 2020

Thanks!

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

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.