summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2020-11-28 16:41:00 +0100
committerFabian Groffen <grobian@gentoo.org>2020-11-28 16:41:05 +0100
commit6433ca52701e39e6576702ad37321689ca31eb19 (patch)
tree8f930fa73cbc975cb39665e005668ae971a32cb2 /media-libs/libjpeg-turbo
parentdev-python/async_timeout: ~x64-macos keyworded (diff)
downloadgentoo-6433ca52701e39e6576702ad37321689ca31eb19.tar.gz
gentoo-6433ca52701e39e6576702ad37321689ca31eb19.tar.bz2
gentoo-6433ca52701e39e6576702ad37321689ca31eb19.zip
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 <grobian@gentoo.org>
Diffstat (limited to 'media-libs/libjpeg-turbo')
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild5
1 files changed, 5 insertions, 0 deletions
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