diff of the changes to the ebuild

ffmpeg.diff (text/plain), 1.38 KB, created by Michael Cook on 2024-06-04 02:58:02 UTC

--- /var/db/repos/gentoo/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild	2024-05-02 07:00:35.004961562 -0400
+++ /var/db/repos/local/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild	2024-05-02 10:16:19.523864150 -0400
@@ -88,6 +88,9 @@
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
+# We need to detect LTO usage before multilib stuff and filter-lto is called
+LTO_FLAG=""
+
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)
 # or $(use_enable foo foo) if no :bar is set.
@@ -419,6 +422,13 @@
 
 	ln -snf "${FILESDIR}"/chromium.c chromium.c || die
 	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+
+	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"
+	fi
+	filter-lto
 }
 
 multilib_src_configure() {
@@ -510,12 +520,9 @@
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	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" )
+	if [[ ${ABI} != x86 && ! -z ${LTO_FLAG} ]]; then
+		myconf+=( ${LTO_FLAG} )
 	fi
-	filter-lto
 
 	# Mandatory configuration
 	myconf=(