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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E72AC158087 for ; Fri, 14 Jan 2022 13:58:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D7812BC02A; Fri, 14 Jan 2022 13:58:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D0F22BC024 for ; Fri, 14 Jan 2022 13:58:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EB673434CD for ; Fri, 14 Jan 2022 13:58:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EA34D0 for ; Fri, 14 Jan 2022 13:58:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642168567.cc00a665f6f530f46069d28707a63775f518423d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild media-video/ffmpeg/ffmpeg-4.4-r1.ebuild media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild media-video/ffmpeg/ffmpeg-9999.ebuild X-VCS-Directories: media-video/ffmpeg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cc00a665f6f530f46069d28707a63775f518423d X-VCS-Branch: master Date: Fri, 14 Jan 2022 13:58:26 +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: 67d83cf3-a6a3-4ad2-bf94-399c50692fd0 X-Archives-Hash: 688e2b0b5e869c8b99f736952abcef65 commit: cc00a665f6f530f46069d28707a63775f518423d Author: Adrian Ratiu collabora com> AuthorDate: Thu Jan 13 11:59:09 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 14 13:56:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc00a665 media-video/ffmpeg: fix mixed strip usage Even though stripping is disabled for compiled binaries (--disable-stripping), some configure phase test binaries get stripped and this causes Clang builds to use the GNU strip instead of LLLVM strip. Fix this by specifying to configure the proper version of strip to be used via --strip="$(tc-getSTRIP)" Bug: https://bugs.gentoo.org/831128 Signed-off-by: Adrian Ratiu collabora.com> Closes: https://github.com/gentoo/gentoo/pull/23770 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-4.4-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild | 1 + media-video/ffmpeg/ffmpeg-9999.ebuild | 1 + 6 files changed, 6 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild index 2457a735302d..e7fec8cfab3c 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild @@ -463,6 +463,7 @@ multilib_src_configure() { --cc="$(tc-getCC)" \ --cxx="$(tc-getCXX)" \ --ar="$(tc-getAR)" \ + --strip="$(tc-getSTRIP)" \ --optflags="${CFLAGS}" \ $(use_enable static-libs static) \ "${myconf[@]}" diff --git a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild index 7d3956a93641..4266e2d96288 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild @@ -464,6 +464,7 @@ multilib_src_configure() { --cxx="$(tc-getCXX)" \ --ar="$(tc-getAR)" \ --nm="$(tc-getNM)" \ + --strip="$(tc-getSTRIP)" \ --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ diff --git a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild index 25d462c19509..05f2cf1025ea 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild @@ -464,6 +464,7 @@ multilib_src_configure() { --cxx="$(tc-getCXX)" \ --ar="$(tc-getAR)" \ --nm="$(tc-getNM)" \ + --strip="$(tc-getSTRIP)" \ --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ diff --git a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild index 4f4969b77333..2dbd5e06fce9 100644 --- a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild @@ -469,6 +469,7 @@ multilib_src_configure() { --cxx="$(tc-getCXX)" \ --ar="$(tc-getAR)" \ --nm="$(tc-getNM)" \ + --strip="$(tc-getSTRIP)" \ --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild index d28411d2bd94..d0fcdc2e9005 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild @@ -472,6 +472,7 @@ multilib_src_configure() { --cxx="$(tc-getCXX)" \ --ar="$(tc-getAR)" \ --nm="$(tc-getNM)" \ + --strip="$(tc-getSTRIP)" \ --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index ebffc6b55085..3a6b84d99ab1 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -471,6 +471,7 @@ multilib_src_configure() { --cxx="$(tc-getCXX)" \ --ar="$(tc-getAR)" \ --nm="$(tc-getNM)" \ + --strip="$(tc-getSTRIP)" \ --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \