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 BF56F15817D for ; Tue, 4 Jun 2024 06:56:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 103BC2BC060; Tue, 4 Jun 2024 06:56:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDBD32BC060 for ; Tue, 4 Jun 2024 06:56:43 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27E4733BEFF for ; Tue, 4 Jun 2024 06:56:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 543F71C5E for ; Tue, 4 Jun 2024 06:56:41 +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: <1717484019.2fbd9aa700613a6070ca84af92b58e253a389e63.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-6.1.1-r6.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: 2fbd9aa700613a6070ca84af92b58e253a389e63 X-VCS-Branch: master Date: Tue, 4 Jun 2024 06:56:41 +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: a11cfb0d-88c8-409a-ad92-ffe642244291 X-Archives-Hash: 052003745e9fffcd1cf8d87c57ba67ad commit: 2fbd9aa700613a6070ca84af92b58e253a389e63 Author: Eli Schwartz gmail com> AuthorDate: Tue Jun 4 03:52:49 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 4 06:53:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbd9aa7 media-video/ffmpeg: fix another LTO breakage, this time with bare -flto `get-flag` is a bit of a funny API. It offers to provide the value of a flag, implying, the part after the =. But if there is no = then it simply returns you the whole flag, whereas you might think it returns empty. ffmpeg was relying on it returning empty for the case where no value is passed, but instead we ended up passing --enable-lto=-flto for such a case, which the ffmpeg configure script happily accepts as a valid value, and then silently drops since it doesn't actually work. End result: no LTO for the package with -flto, but working LTO if you used e.g. -flto=4 instead. Explicitly handle the -flto case. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild | 2 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild index fa3dd7774141..78278c02f240 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild @@ -424,7 +424,7 @@ src_prepare() { if tc-is-lto ; then # Respect -flto value, e.g -flto=thin local v="$(get-flag flto)" - [[ -n ${v} ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto" + [[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto" fi filter-lto } diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index e4783cb8348f..e6491c785ef4 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -419,7 +419,7 @@ src_prepare() { if tc-is-lto ; then # Respect -flto value, e.g -flto=thin local v="$(get-flag flto)" - [[ -n ${v} ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto" + [[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto" fi filter-lto }