| 1 |
commit: 97aa0cb3357e3ce8bdd346f450772468d8b0c936 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Sep 14 13:00:00 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 15 18:33:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97aa0cb3 |
| 7 |
|
| 8 |
media-video/x264-encoder: Set special value of AS to fix build failure. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/740566 |
| 11 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 6 ++++++ |
| 15 |
media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild | 6 ++++++ |
| 16 |
media-video/x264-encoder/x264-encoder-9999.ebuild | 6 ++++++ |
| 17 |
3 files changed, 18 insertions(+) |
| 18 |
|
| 19 |
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild |
| 20 |
index 893ddce8fed..1c576fa216e 100644 |
| 21 |
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild |
| 22 |
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild |
| 23 |
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" ) |
| 24 |
src_configure() { |
| 25 |
tc-export CC |
| 26 |
|
| 27 |
+ if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then |
| 28 |
+ export AS="nasm" |
| 29 |
+ else |
| 30 |
+ export AS="${CC}" |
| 31 |
+ fi |
| 32 |
+ |
| 33 |
# let upstream pick the optimization level by default |
| 34 |
use custom-cflags || filter-flags -O? |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild |
| 38 |
index 18dccd367cb..13b167268ff 100644 |
| 39 |
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild |
| 40 |
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild |
| 41 |
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" ) |
| 42 |
src_configure() { |
| 43 |
tc-export CC |
| 44 |
|
| 45 |
+ if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then |
| 46 |
+ export AS="nasm" |
| 47 |
+ else |
| 48 |
+ export AS="${CC}" |
| 49 |
+ fi |
| 50 |
+ |
| 51 |
# let upstream pick the optimization level by default |
| 52 |
use custom-cflags || filter-flags -O? |
| 53 |
|
| 54 |
|
| 55 |
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild |
| 56 |
index 18dccd367cb..13b167268ff 100644 |
| 57 |
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild |
| 58 |
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild |
| 59 |
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" ) |
| 60 |
src_configure() { |
| 61 |
tc-export CC |
| 62 |
|
| 63 |
+ if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then |
| 64 |
+ export AS="nasm" |
| 65 |
+ else |
| 66 |
+ export AS="${CC}" |
| 67 |
+ fi |
| 68 |
+ |
| 69 |
# let upstream pick the optimization level by default |
| 70 |
use custom-cflags || filter-flags -O? |
Archives