[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/

["Zac Medico" <zmedico@gentoo.org>]

commit:     a0878db1c9b17cf2500b2f8ad434562042cbb1d9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 07:16:22 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 07:21:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0878db1

dev-util/android-tools: Re-apply LTO-unsafe fix

Re-apply the LTO-unsafe fix from commit
0c03b34a1057b2859947e5c1f8c592ff412babf3.

Fixes: https://github.com/gentoo/gentoo/pull/38069
Closes: https://bugs.gentoo.org/937769
Reported-by: Eli Schwartz <eschwartz <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/android-tools/android-tools-35.0.1.ebuild | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-35.0.1.ebuild b/dev-util/android-tools/android-tools-35.0.1.ebuild
index 0ff6f3bbb94f..9dacbecf215d 100644
--- a/dev-util/android-tools/android-tools-35.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-35.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake python-r1
+inherit cmake flag-o-matic python-r1
 
 DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
 HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
@@ -54,11 +54,26 @@ src_prepare() {
 	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
 
 	cd "${S}" || die
+
+	# why do we depend on libandroidfw? It is never linked to or used.
+	# https://github.com/nmeum/android-tools/issues/148
+	sed -i '/libandroidfw/d' vendor/CMakeLists.txt || die
+	rm -r vendor/base || die
+
 	rm -r patches || die
 	cmake_src_prepare
 }
 
 src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	#
+	# https://bugs.gentoo.org/858311
+	# https://issuetracker.google.com/issues/347247969
+	#
+	# and in vendored f2fs-tools copy:
+	# https://bugs.gentoo.org/863896
+	filter-lto
+
 	local mycmakeargs=(
 		# Statically link the bundled boringssl
 		-DCMAKE_BUILD_TYPE=Release \