diff options
| author | Mike Gilbert <floppym@gentoo.org> | 2018-03-09 16:03:03 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-03-09 16:03:03 -0500 |
| commit | 7df5c72df25e3c79e487df9ba464709702847f21 (patch) | |
| tree | e01ec49ff065dfdaf411c9032c8c6aead69a1516 /www-client | |
| parent | c0a79159ac9df882d809f30cfcddb87b9c6f6bbf (diff) | |
| download | gentoo-7df5c72df25e3c79e487df9ba464709702847f21.tar.gz gentoo-7df5c72df25e3c79e487df9ba464709702847f21.tar.xz | |
www-client/chromium: fix bundled ffmpeg to not force lld
Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/chromium-65.0.3325.146.ebuild | 1 | ||||
| -rw-r--r-- | www-client/chromium/chromium-66.0.3355.0.ebuild | 1 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-ffmpeg-clang.patch | 21 |
3 files changed, 23 insertions, 0 deletions
diff --git a/www-client/chromium/chromium-65.0.3325.146.ebuild b/www-client/chromium/chromium-65.0.3325.146.ebuild index 11bbb4b7780..3ca4d45a0ba 100644 --- a/www-client/chromium/chromium-65.0.3325.146.ebuild +++ b/www-client/chromium/chromium-65.0.3325.146.ebuild @@ -154,6 +154,7 @@ PATCHES=( "${FILESDIR}/chromium-math.h-r0.patch" "${FILESDIR}/chromium-clang-r3.patch" "${FILESDIR}/chromium-stdint.patch" + "${FILESDIR}/chromium-ffmpeg-clang.patch" ) pre_build_checks() { diff --git a/www-client/chromium/chromium-66.0.3355.0.ebuild b/www-client/chromium/chromium-66.0.3355.0.ebuild index 4c8e080b09e..72c8738a74f 100644 --- a/www-client/chromium/chromium-66.0.3355.0.ebuild +++ b/www-client/chromium/chromium-66.0.3355.0.ebuild @@ -154,6 +154,7 @@ PATCHES=( "${FILESDIR}/chromium-stdint.patch" "${FILESDIR}/chromium-clang-r4.patch" "${FILESDIR}/chromium-ffmpeg-r1.patch" + "${FILESDIR}/chromium-ffmpeg-clang.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-ffmpeg-clang.patch b/www-client/chromium/files/chromium-ffmpeg-clang.patch new file mode 100644 index 00000000000..6c5ac71323b --- /dev/null +++ b/www-client/chromium/files/chromium-ffmpeg-clang.patch @@ -0,0 +1,21 @@ +--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py ++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py +@@ -639,18 +639,8 @@ + if 'win' not in target_os: + configure_flags['Common'].extend([ + '--enable-pic', +- '--cc=clang', +- '--cxx=clang++', +- '--ld=clang', + ]) + +- # Clang Linux will use the first 'ld' it finds on the path, which will +- # typically be the system one, so explicitly configure use of Clang's +- # ld.lld, to ensure that things like cross-compilation and LTO work. +- # This does not work for arm64, ia32 and is always used on mac. +- if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac': +- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld') +- + # Should be run on Mac. + if target_os == 'mac': + if host_os != 'mac': |