commit: 0c03b34a1057b2859947e5c1f8c592ff412babf3 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Sun Jun 16 19:02:49 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 17 01:46:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c03b34a
dev-util/android-tools: mark as LTO-unsafe And delete some build system glop that has strict-aliasing errors but is never actually used. Closes: https://bugs.gentoo.org/858311 Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/android-tools/android-tools-34.0.5.ebuild | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild index 7df559af43f4..32ad5c7b7ab0 100644 --- a/dev-util/android-tools/android-tools-34.0.5.ebuild +++ b/dev-util/android-tools/android-tools-34.0.5.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 \
