From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9ABCB1580E0 for ; Mon, 02 Jun 2025 22:20:25 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8444A335D72 for ; Mon, 02 Jun 2025 22:20:25 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 79EEC1102CD; Mon, 02 Jun 2025 22:20:24 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 683CB1102CD for ; Mon, 02 Jun 2025 22:20:24 +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 1F4FB335D72 for ; Mon, 02 Jun 2025 22:20:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8284C1397 for ; Mon, 02 Jun 2025 22:20:22 +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: <1748902774.f9d28a0b7383df41bbfa37ab0d751457541ffd46.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/, dev-util/android-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/android-tools/android-tools-35.0.2.ebuild dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch X-VCS-Directories: dev-util/android-tools/ dev-util/android-tools/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f9d28a0b7383df41bbfa37ab0d751457541ffd46 X-VCS-Branch: master Date: Mon, 02 Jun 2025 22:20:22 +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: 502a58ee-4c0e-4fcb-94bc-a77a084d74df X-Archives-Hash: 76ffe9a6f28828f993e5440c1fe25754 commit: f9d28a0b7383df41bbfa37ab0d751457541ffd46 Author: Kostadin Shishmanov protonmail com> AuthorDate: Mon Jun 2 21:57:00 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 2 22:19:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d28a0b dev-util/android-tools: fix building with gcc 16 More libstdc++ changes landed upstream which shuffled some things around again, so and have to be explicitly included. Signed-off-by: Kostadin Shishmanov protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42415 Closes: https://github.com/gentoo/gentoo/pull/42415 Signed-off-by: Sam James gentoo.org> dev-util/android-tools/android-tools-35.0.2.ebuild | 1 + .../files/android-tools-35.0.2-gcc-16.patch | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dev-util/android-tools/android-tools-35.0.2.ebuild b/dev-util/android-tools/android-tools-35.0.2.ebuild index 168e17c27b8f..2026a45945d0 100644 --- a/dev-util/android-tools/android-tools-35.0.2.ebuild +++ b/dev-util/android-tools/android-tools-35.0.2.ebuild @@ -50,6 +50,7 @@ DOCS=() src_prepare() { eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch" eapply "${FILESDIR}/android-tools-35.0.2-protobuf.patch" + eapply "${FILESDIR}/android-tools-35.0.2-gcc-16.patch" cd "${S}/vendor/core" || die eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch" diff --git a/dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch b/dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch new file mode 100644 index 000000000000..915a972e0e6c --- /dev/null +++ b/dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch @@ -0,0 +1,27 @@ +https://android-review.googlesource.com/c/platform/system/libbase/+/3555906 +https://android-review.googlesource.com/c/platform/system/libziparchive/+/3649395 + +diff --git a/vendor/libbase/hex.cpp b/vendor/libbase/hex.cpp +index a4b7715..85ba671 100644 +--- a/vendor/libbase/hex.cpp ++++ b/vendor/libbase/hex.cpp +@@ -18,6 +18,8 @@ + + #include "android-base/logging.h" + ++#include ++ + namespace android { + namespace base { + +diff --git a/vendor/libziparchive/include/ziparchive/zip_writer.h b/vendor/libziparchive/include/ziparchive/zip_writer.h +index 268e8b6..aca7f4e 100644 +--- a/vendor/libziparchive/include/ziparchive/zip_writer.h ++++ b/vendor/libziparchive/include/ziparchive/zip_writer.h +@@ -16,6 +16,7 @@ + + #pragma once + ++#include + #include + #include