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 CEA491382C5 for ; Sat, 28 Nov 2020 15:41:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14FF2E081B; Sat, 28 Nov 2020 15:41:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EC8C1E081B for ; Sat, 28 Nov 2020 15:41:11 +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 97F69340C3C for ; Sat, 28 Nov 2020 15:41:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1275C3FB for ; Sat, 28 Nov 2020 15:41:09 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1606578065.6433ca52701e39e6576702ad37321689ca31eb19.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild X-VCS-Directories: media-libs/libjpeg-turbo/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 6433ca52701e39e6576702ad37321689ca31eb19 X-VCS-Branch: master Date: Sat, 28 Nov 2020 15:41:09 +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: db15819b-67c9-40c6-85b8-55354427d1f1 X-Archives-Hash: 8607055e15266b133eae4b2db20454bd commit: 6433ca52701e39e6576702ad37321689ca31eb19 Author: Fabian Groffen gentoo org> AuthorDate: Sat Nov 28 15:41:00 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Nov 28 15:41:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6433ca52 media-libs/libjpeg-turbo-2.0.6: fix compilation on Prefix when the host provides nasm, but we installed yasm, the latter won't be used, so force the usage of yasm when that package is the only installed asm implementation Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild index 47751e0823a..ef462071586 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild @@ -85,6 +85,11 @@ multilib_src_configure() { [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239 + # mostly for Prefix, ensure that we use our yasm if installed and + # not pick up host-provided nasm + has_version dev-lang/yasm && ! has_version dev-lang/nasm && \ + mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) ) + if use ppc ; then # Workaround recommended by upstream: # https://bugs.gentoo.org/715406#c9