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

ffmpeg: don't use gcc on darwin #47189

Merged
merged 1 commit into from Sep 22, 2018
Merged

ffmpeg: don't use gcc on darwin #47189

merged 1 commit into from Sep 22, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Sep 22, 2018 •
edited

Motivation for this change

This isn't necessary and causes build failures for certain versions.

CC      libavfilter/libmpcodecs/vf_eq2.o
CC      libavfilter/libmpcodecs/vf_fil.o
CC      libavfilter/libmpcodecs/vf_fspp.o
libavfilter/libmpcodecs/vf_fspp.c:939:18: error: unknown token in expression
        movq %mm2, 0*8+(%rsp)

/cc ZHF #45961

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.

@LnL7
ffmpeg: don't use gcc on darwin
4714212 
This isn't necessary and causes build failures for certain versions.

    CC      libavfilter/libmpcodecs/vf_eq2.o
    CC      libavfilter/libmpcodecs/vf_fil.o
    CC      libavfilter/libmpcodecs/vf_fspp.o
    libavfilter/libmpcodecs/vf_fspp.c:939:18: error: unknown token in expression
            movq %mm2, 0*8+(%rsp)

/cc ZHF NixOS#45961
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ffmpeg

Partial log (click to expand)

/nix/store/259vaclyhwma0ahcfm8wz17cx90nc6xl-ffmpeg-3.4.4-bin

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ffmpeg

Partial log (click to expand)

  /nix/store/vyd0fwkb8r04lmkhvjf4q4pm8jb4pchq-ffmpeg-3.4.4
  /nix/store/wxgrm714pg31iqr52l0lv8v0g8bhzxgb-lame-3.100-lib
  /nix/store/xp9lrd4sh3v4x0xg7qnbwdfjf20rhn3c-libva-2.1.0
copying path '/nix/store/wxgrm714pg31iqr52l0lv8v0g8bhzxgb-lame-3.100-lib' from 'https://cache.nixos.org'...
copying path '/nix/store/fj48im5m76lmazrzwzs0fn2d8yqb4y3r-libvdpau-1.1.1' from 'https://cache.nixos.org'...
copying path '/nix/store/xp9lrd4sh3v4x0xg7qnbwdfjf20rhn3c-libva-2.1.0' from 'https://cache.nixos.org'...
copying path '/nix/store/kjphxrq2krd0rdlcb4skwc1p0k5nbira-soxr-0.1.3' from 'https://cache.nixos.org'...
copying path '/nix/store/vyd0fwkb8r04lmkhvjf4q4pm8jb4pchq-ffmpeg-3.4.4' from 'https://cache.nixos.org'...
copying path '/nix/store/3274k30sa4zfcprgy37dv4nazyal4lnj-ffmpeg-3.4.4-bin' from 'https://cache.nixos.org'...
/nix/store/3274k30sa4zfcprgy37dv4nazyal4lnj-ffmpeg-3.4.4-bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: ffmpeg

Partial log (click to expand)

find: '/nix/store/5slnycwlcjn08i36cbbnkdh5csn2sw5a-ffmpeg-3.4.4-doc': No such file or directory
find: '/nix/store/5slnycwlcjn08i36cbbnkdh5csn2sw5a-ffmpeg-3.4.4-doc': No such file or directory
find: '/nix/store/5slnycwlcjn08i36cbbnkdh5csn2sw5a-ffmpeg-3.4.4-doc': No such file or directory
find: '/nix/store/5slnycwlcjn08i36cbbnkdh5csn2sw5a-ffmpeg-3.4.4-doc': No such file or directory
find: '/nix/store/5slnycwlcjn08i36cbbnkdh5csn2sw5a-ffmpeg-3.4.4-doc': No such file or directory
Moving /nix/store/0s9kjf01ny3f0zpadng4djkc0al7q5rz-ffmpeg-3.4.4/bin to /nix/store/jrcgmv9n0bjkbrwzm0zixxx5mvmkvzhd-ffmpeg-3.4.4-bin/bin
rmdir: failed to remove '/nix/store/0s9kjf01ny3f0zpadng4djkc0al7q5rz-ffmpeg-3.4.4': Directory not empty
Moving /nix/store/0s9kjf01ny3f0zpadng4djkc0al7q5rz-ffmpeg-3.4.4/share/ffmpeg/examples to /nix/store/5slnycwlcjn08i36cbbnkdh5csn2sw5a-ffmpeg-3.4.4-doc/share/ffmpeg/examples
rmdir: failed to remove '/nix/store/0s9kjf01ny3f0zpadng4djkc0al7q5rz-ffmpeg-3.4.4/share/ffmpeg': Directory not empty
/nix/store/jrcgmv9n0bjkbrwzm0zixxx5mvmkvzhd-ffmpeg-3.4.4-bin

@xeji xeji merged commit 52a1179 into NixOS:master Sep 22, 2018
xeji pushed a commit that referenced this pull request Sep 22, 2018
@LnL7 @xeji
ffmpeg: don't use gcc on darwin (#47189)
1cae9ef 
This isn't necessary and causes build failures for certain versions.

    CC      libavfilter/libmpcodecs/vf_eq2.o
    CC      libavfilter/libmpcodecs/vf_fil.o
    CC      libavfilter/libmpcodecs/vf_fspp.o
    libavfilter/libmpcodecs/vf_fspp.c:939:18: error: unknown token in expression
            movq %mm2, 0*8+(%rsp)

/cc ZHF #45961

(cherry picked from commit 52a1179)
@xeji
Copy link
Contributor

xeji commented Sep 22, 2018

backported: 1cae9ef

@LnL7 LnL7 deleted the darwin-ffmpeg branch September 22, 2018 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@LnL7 @GrahamcOfBorg @xeji