commit: 47a2a87a9573f8d77f38f3a9bbfa4d4e8eb54d28 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jan 23 18:41:15 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 23 18:45:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a2a87a
media-video/ffmpeg: use tc-is-lto instead of error-prone is-flagq is-flagq won't pick up on e.g. -fno-lto appended. Closes: https://bugs.gentoo.org/909572 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r11.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1-r4.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index b7074d60fdc3..e17af76cfa74 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -483,7 +483,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild index 6c34aca8e4cd..9ecde222b8e3 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild @@ -473,7 +473,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild index 24dde90568fd..6d75a5d847db 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild @@ -472,7 +472,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 8545e512f44c..9831ab3e47c5 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -470,7 +470,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild index f3fabab58737..bdc0a1471158 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild @@ -469,7 +469,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild index 6db23cdd6bfc..d3edaba40eb7 100644 --- a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild @@ -482,7 +482,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then + if [[ ${ABI} != x86 ]] && tc-is-lto; then # Respect -flto value, e.g -flto=thin local v="$(get-flag flto)" [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild index 4a9376a14e3e..73cdd4b40c76 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild @@ -476,7 +476,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then + if [[ ${ABI} != x86 ]] && tc-is-lto; then # Respect -flto value, e.g -flto=thin local v="$(get-flag flto)" [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index af17b97264cd..905f9dd7977b 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -475,7 +475,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then + if [[ ${ABI} != x86 ]] && tc-is-lto; then # Respect -flto value, e.g -flto=thin local v="$(get-flag flto)" [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
