| 1 |
commit: 6433ca52701e39e6576702ad37321689ca31eb19 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 28 15:41:00 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 28 15:41:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6433ca52 |
| 7 |
|
| 8 |
media-libs/libjpeg-turbo-2.0.6: fix compilation on Prefix |
| 9 |
|
| 10 |
when the host provides nasm, but we installed yasm, the latter won't be |
| 11 |
used, so force the usage of yasm when that package is the only installed |
| 12 |
asm implementation |
| 13 |
|
| 14 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 15 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 16 |
|
| 17 |
media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild | 5 +++++ |
| 18 |
1 file changed, 5 insertions(+) |
| 19 |
|
| 20 |
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild |
| 21 |
index 47751e0823a..ef462071586 100644 |
| 22 |
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild |
| 23 |
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild |
| 24 |
@@ -85,6 +85,11 @@ multilib_src_configure() { |
| 25 |
|
| 26 |
[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239 |
| 27 |
|
| 28 |
+ # mostly for Prefix, ensure that we use our yasm if installed and |
| 29 |
+ # not pick up host-provided nasm |
| 30 |
+ has_version dev-lang/yasm && ! has_version dev-lang/nasm && \ |
| 31 |
+ mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) ) |
| 32 |
+ |
| 33 |
if use ppc ; then |
| 34 |
# Workaround recommended by upstream: |
| 35 |
# https://bugs.gentoo.org/715406#c9 |
Archives