commit: 295166a86e96aef23f9cc311e71eb29556aaeaa4 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Sat Sep 5 16:00:00 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Sep 5 18:54:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=295166a8
media-libs/x264: Set special value of AS to fix build failure. Closes: https://bugs.gentoo.org/721026 Closes: https://bugs.gentoo.org/724676 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> media-libs/x264/x264-0.0.20190214.ebuild | 7 +++++++ media-libs/x264/x264-0.0.20190903-r1.ebuild | 7 +++++++ media-libs/x264/x264-0.0.20190903.ebuild | 7 +++++++ media-libs/x264/x264-9999.ebuild | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild index a181239df0d..7868773a08d 100644 --- a/media-libs/x264/x264-0.0.20190214.ebuild +++ b/media-libs/x264/x264-0.0.20190214.ebuild @@ -32,6 +32,13 @@ DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) multilib_src_configure() { tc-export CC + + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + local asm_conf="" if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !altivec ; }; then diff --git a/media-libs/x264/x264-0.0.20190903-r1.ebuild b/media-libs/x264/x264-0.0.20190903-r1.ebuild index e65caa445b8..453ed7982ff 100644 --- a/media-libs/x264/x264-0.0.20190903-r1.ebuild +++ b/media-libs/x264/x264-0.0.20190903-r1.ebuild @@ -34,6 +34,13 @@ PATCHES=("${FILESDIR}"/${P}-STRINGS.patch) multilib_src_configure() { tc-export CC + + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + local asm_conf="" if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; then diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild index 920c6880613..1a64a1a4612 100644 --- a/media-libs/x264/x264-0.0.20190903.ebuild +++ b/media-libs/x264/x264-0.0.20190903.ebuild @@ -32,6 +32,13 @@ DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) multilib_src_configure() { tc-export CC + + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + local asm_conf="" if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; then diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 83de5d6c78b..1d20cc1b73e 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -32,6 +32,13 @@ DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) multilib_src_configure() { tc-export CC + + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + local asm_conf="" if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; then
