From 97aa0cb3357e3ce8bdd346f450772468d8b0c936 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 14 Sep 2020 13:00:00 +0000 Subject: [PATCH] media-video/x264-encoder: Set special value of AS to fix build failure. Closes: https://bugs.gentoo.org/740566 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Signed-off-by: Mike Gilbert --- media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 6 ++++++ media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild | 6 ++++++ media-video/x264-encoder/x264-encoder-9999.ebuild | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild index 893ddce8fed18..1c576fa216e7f 100644 --- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild +++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild @@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" ) src_configure() { tc-export CC + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + # let upstream pick the optimization level by default use custom-cflags || filter-flags -O? diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild index 18dccd367cb04..13b167268ffb0 100644 --- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild +++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild @@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" ) src_configure() { tc-export CC + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + # let upstream pick the optimization level by default use custom-cflags || filter-flags -O? diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild index 18dccd367cb04..13b167268ffb0 100644 --- a/media-video/x264-encoder/x264-encoder-9999.ebuild +++ b/media-video/x264-encoder/x264-encoder-9999.ebuild @@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" ) src_configure() { tc-export CC + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + # let upstream pick the optimization level by default use custom-cflags || filter-flags -O?