| 1 |
commit: cc00a665f6f530f46069d28707a63775f518423d |
| 2 |
Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com> |
| 3 |
AuthorDate: Thu Jan 13 11:59:09 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 14 13:56:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc00a665 |
| 7 |
|
| 8 |
media-video/ffmpeg: fix mixed strip usage |
| 9 |
|
| 10 |
Even though stripping is disabled for compiled binaries |
| 11 |
(--disable-stripping), some configure phase test binaries |
| 12 |
get stripped and this causes Clang builds to use the GNU |
| 13 |
strip instead of LLLVM strip. |
| 14 |
|
| 15 |
Fix this by specifying to configure the proper version of |
| 16 |
strip to be used via --strip="$(tc-getSTRIP)" |
| 17 |
|
| 18 |
Bug: https://bugs.gentoo.org/831128 |
| 19 |
Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com> |
| 20 |
Closes: https://github.com/gentoo/gentoo/pull/23770 |
| 21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 22 |
|
| 23 |
media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild | 1 + |
| 24 |
media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild | 1 + |
| 25 |
media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild | 1 + |
| 26 |
media-video/ffmpeg/ffmpeg-4.4-r1.ebuild | 1 + |
| 27 |
media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild | 1 + |
| 28 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 1 + |
| 29 |
6 files changed, 6 insertions(+) |
| 30 |
|
| 31 |
diff --git a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild |
| 32 |
index 2457a735302d..e7fec8cfab3c 100644 |
| 33 |
--- a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild |
| 34 |
+++ b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild |
| 35 |
@@ -463,6 +463,7 @@ multilib_src_configure() { |
| 36 |
--cc="$(tc-getCC)" \ |
| 37 |
--cxx="$(tc-getCXX)" \ |
| 38 |
--ar="$(tc-getAR)" \ |
| 39 |
+ --strip="$(tc-getSTRIP)" \ |
| 40 |
--optflags="${CFLAGS}" \ |
| 41 |
$(use_enable static-libs static) \ |
| 42 |
"${myconf[@]}" |
| 43 |
|
| 44 |
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild |
| 45 |
index 7d3956a93641..4266e2d96288 100644 |
| 46 |
--- a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild |
| 47 |
+++ b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild |
| 48 |
@@ -464,6 +464,7 @@ multilib_src_configure() { |
| 49 |
--cxx="$(tc-getCXX)" \ |
| 50 |
--ar="$(tc-getAR)" \ |
| 51 |
--nm="$(tc-getNM)" \ |
| 52 |
+ --strip="$(tc-getSTRIP)" \ |
| 53 |
--ranlib="$(tc-getRANLIB)" \ |
| 54 |
--pkg-config="$(tc-getPKG_CONFIG)" \ |
| 55 |
--optflags="${CFLAGS}" \ |
| 56 |
|
| 57 |
diff --git a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild |
| 58 |
index 25d462c19509..05f2cf1025ea 100644 |
| 59 |
--- a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild |
| 60 |
+++ b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild |
| 61 |
@@ -464,6 +464,7 @@ multilib_src_configure() { |
| 62 |
--cxx="$(tc-getCXX)" \ |
| 63 |
--ar="$(tc-getAR)" \ |
| 64 |
--nm="$(tc-getNM)" \ |
| 65 |
+ --strip="$(tc-getSTRIP)" \ |
| 66 |
--ranlib="$(tc-getRANLIB)" \ |
| 67 |
--pkg-config="$(tc-getPKG_CONFIG)" \ |
| 68 |
--optflags="${CFLAGS}" \ |
| 69 |
|
| 70 |
diff --git a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild |
| 71 |
index 4f4969b77333..2dbd5e06fce9 100644 |
| 72 |
--- a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild |
| 73 |
+++ b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild |
| 74 |
@@ -469,6 +469,7 @@ multilib_src_configure() { |
| 75 |
--cxx="$(tc-getCXX)" \ |
| 76 |
--ar="$(tc-getAR)" \ |
| 77 |
--nm="$(tc-getNM)" \ |
| 78 |
+ --strip="$(tc-getSTRIP)" \ |
| 79 |
--ranlib="$(tc-getRANLIB)" \ |
| 80 |
--pkg-config="$(tc-getPKG_CONFIG)" \ |
| 81 |
--optflags="${CFLAGS}" \ |
| 82 |
|
| 83 |
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild |
| 84 |
index d28411d2bd94..d0fcdc2e9005 100644 |
| 85 |
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild |
| 86 |
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild |
| 87 |
@@ -472,6 +472,7 @@ multilib_src_configure() { |
| 88 |
--cxx="$(tc-getCXX)" \ |
| 89 |
--ar="$(tc-getAR)" \ |
| 90 |
--nm="$(tc-getNM)" \ |
| 91 |
+ --strip="$(tc-getSTRIP)" \ |
| 92 |
--ranlib="$(tc-getRANLIB)" \ |
| 93 |
--pkg-config="$(tc-getPKG_CONFIG)" \ |
| 94 |
--optflags="${CFLAGS}" \ |
| 95 |
|
| 96 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 97 |
index ebffc6b55085..3a6b84d99ab1 100644 |
| 98 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 99 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 100 |
@@ -471,6 +471,7 @@ multilib_src_configure() { |
| 101 |
--cxx="$(tc-getCXX)" \ |
| 102 |
--ar="$(tc-getAR)" \ |
| 103 |
--nm="$(tc-getNM)" \ |
| 104 |
+ --strip="$(tc-getSTRIP)" \ |
| 105 |
--ranlib="$(tc-getRANLIB)" \ |
| 106 |
--pkg-config="$(tc-getPKG_CONFIG)" \ |
| 107 |
--optflags="${CFLAGS}" \ |
Archives