From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 08DE5138359 for ; Sat, 5 Sep 2020 18:54:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24FADE086C; Sat, 5 Sep 2020 18:54:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1B5CE086C for ; Sat, 5 Sep 2020 18:54:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DBEE3340DAB for ; Sat, 5 Sep 2020 18:54:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 618B3335 for ; Sat, 5 Sep 2020 18:54:28 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1599332053.295166a86e96aef23f9cc311e71eb29556aaeaa4.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x264/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x264/x264-0.0.20190214.ebuild media-libs/x264/x264-0.0.20190903-r1.ebuild media-libs/x264/x264-0.0.20190903.ebuild media-libs/x264/x264-9999.ebuild X-VCS-Directories: media-libs/x264/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 295166a86e96aef23f9cc311e71eb29556aaeaa4 X-VCS-Branch: master Date: Sat, 5 Sep 2020 18:54:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2760830b-3069-45bd-ac54-801505368a52 X-Archives-Hash: 2fb69c2b9ebaabd9bb15c7cb0d423369 commit: 295166a86e96aef23f9cc311e71eb29556aaeaa4 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Sep 5 16:00:00 2020 +0000 Commit: Mike Gilbert gentoo 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 Apache.Org> Signed-off-by: Mike Gilbert 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