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 8DB4F15817D for ; Mon, 17 Jun 2024 01:48:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23B64E2A9D; Mon, 17 Jun 2024 01:47:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 025D3E2A98 for ; Mon, 17 Jun 2024 01:47:58 +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 CC72F335C96 for ; Mon, 17 Jun 2024 01:47:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F0711682 for ; Mon, 17 Jun 2024 01:47:56 +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: <1718588808.0c03b34a1057b2859947e5c1f8c592ff412babf3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/android-tools/android-tools-34.0.5.ebuild X-VCS-Directories: dev-util/android-tools/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0c03b34a1057b2859947e5c1f8c592ff412babf3 X-VCS-Branch: master Date: Mon, 17 Jun 2024 01:47:56 +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: 3744908e-ba5a-467a-b7ef-224984d4b8b3 X-Archives-Hash: 5b1a202ba4fa8ed463a71248848cb8e2 commit: 0c03b34a1057b2859947e5c1f8c592ff412babf3 Author: Eli Schwartz gmail com> AuthorDate: Sun Jun 16 19:02:49 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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 \