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

pkgsCross.ppc64.libffi: pull patch to support gcc-12 #175914

Merged
merged 1 commit into from
Jun 7, 2022

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jun 2, 2022

Without the change libffi fails to build against gcc-12 as:

libtool: compile:  powerpc64-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude \
    -I../src -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math -Wall -fexceptions -c ../src/tramp.c \
    -fPIC -DPIC -o src/.libs/tramp.o
../src/powerpc/linux64_closure.S: Assembler messages:
../src/powerpc/linux64_closure.S:363: Error: unrecognized opcode: `lvx'
Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Mindavi Mindavi added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jun 2, 2022
@trofi trofi force-pushed the libffi-fix-for-gcc-12-powerpc64 branch from 3bbb001 to 582867d Compare June 2, 2022 21:22
@trofi
Copy link
Contributor Author

trofi commented Jun 2, 2022

Made patch unconditional and inlined it to avoid fetchpatch circular depend.

@trofi trofi requested a review from SuperSandro2000 June 2, 2022 21:23
@@ -21,7 +16,13 @@ stdenv.mkDerivation rec {
sha256 = "081nx7wpzds168jbr59m34n6s3lyiq6r8zggvqxvlslsc4hvf3sl";
};

patches = [];
# Note: this package is used for bootstrapping fetchurl, and thus
Copy link
Member

Choose a reason for hiding this comment

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

Better place but most other files have it at the top. Should be fine to change it though.

@trofi trofi changed the title pkgsCross.ppc64.libffi: pull past to support gcc-12 pkgsCross.ppc64.libffi: pull patch to support gcc-12 Jun 2, 2022
Without the change `libffi` fails to build against `gcc-12` as:

    libtool: compile:  powerpc64-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude \
        -I../src -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math -Wall -fexceptions -c ../src/tramp.c \
        -fPIC -DPIC -o src/.libs/tramp.o
    ../src/powerpc/linux64_closure.S: Assembler messages:
    ../src/powerpc/linux64_closure.S:363: Error: unrecognized opcode: `lvx'

Co-authored-by: Sandro <[email protected]>
@trofi trofi force-pushed the libffi-fix-for-gcc-12-powerpc64 branch from 582867d to 55886c3 Compare June 2, 2022 21:45
@trofi
Copy link
Contributor Author

trofi commented Jun 3, 2022

@ofborg eval

Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

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

Diff looks ok.

@trofi trofi merged commit dedcf62 into NixOS:staging Jun 7, 2022
@trofi trofi deleted the libffi-fix-for-gcc-12-powerpc64 branch June 7, 2022 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants