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 BB600158010 for ; Fri, 27 Jan 2023 05:26:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2306EE07F9; Fri, 27 Jan 2023 05:26:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D1A3CE07C9 for ; Fri, 27 Jan 2023 05:26:47 +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 81E82335DB6 for ; Fri, 27 Jan 2023 05:26:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1A8B88E for ; Fri, 27 Jan 2023 05:26:44 +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: <1674797011.5216d3cd0bf3a81048897d15ba4c00e0559ccf11.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-33.0.3-r1.ebuild dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.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: 5216d3cd0bf3a81048897d15ba4c00e0559ccf11 X-VCS-Branch: master Date: Fri, 27 Jan 2023 05:26:44 +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: e513038a-8036-4745-be9b-8bf533c15550 X-Archives-Hash: 283ec41c9c591a6423211cca59731f93 commit: 5216d3cd0bf3a81048897d15ba4c00e0559ccf11 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 05:23:00 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 27 05:23:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5216d3cd dev-util/android-tools: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/875575 Signed-off-by: Sam James gentoo.org> .../android-tools/android-tools-33.0.3-r1.ebuild | 3 ++- .../files/android-tools-33.0.3-adb-gcc-13.patch | 25 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild index 3b9b45c7c8e0..155cf7f10a4b 100644 --- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild +++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild @@ -55,8 +55,9 @@ src_prepare() { cd "${S}/vendor/adb" || die eapply "${FILESDIR}/${P}-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch" + eapply "${FILESDIR}/${P}-adb-gcc-13.patch" - cd "${S}" + cd "${S}" || die rm -r patches || die cmake_src_prepare } diff --git a/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch b/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch new file mode 100644 index 000000000000..4ba2c9a49c31 --- /dev/null +++ b/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/875575 +https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2399311 + +From ddffab649b12dce1502d63711836b58d007f6a28 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Mon, 23 Jan 2023 23:09:52 +0100 +Subject: [PATCH] Fix build with gcc 13 by including + +Like other versions before, gcc 13 moved some includes around and as a +result is no longer transitively included. Explicitly include +it for uint{32,64}_t. + +Test: local build +Change-Id: I05a27726b05427c486fd01b013dba4d698abac97 +--- a/file_sync_protocol.h ++++ b/file_sync_protocol.h +@@ -16,6 +16,8 @@ + + #pragma once + ++#include ++ + #define MKID(a, b, c, d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) + + #define ID_LSTAT_V1 MKID('S', 'T', 'A', 'T')