diff options
| author |   Sam James <sam@gentoo.org> | 2023-01-27 05:23:00 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-01-27 05:23:31 +0000 |
| commit | 5216d3cd0bf3a81048897d15ba4c00e0559ccf11 (patch) | |
| tree | 82ffaa5e5b4d9ed3986a024c42694dc1da3765fb /dev-util/android-tools | |
| parent | dev-libs/rocksdb: add github upstream metadata (diff) | |
| download | gentoo-5216d3cd0bf3a81048897d15ba4c00e0559ccf11.tar.gz gentoo-5216d3cd0bf3a81048897d15ba4c00e0559ccf11.tar.bz2 gentoo-5216d3cd0bf3a81048897d15ba4c00e0559ccf11.zip | |
dev-util/android-tools: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/875575
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/android-tools')
| -rw-r--r-- | dev-util/android-tools/android-tools-33.0.3-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch | 25 |
2 files changed, 27 insertions, 1 deletions
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 <heirecka@exherbo.org> +Date: Mon, 23 Jan 2023 23:09:52 +0100 +Subject: [PATCH] Fix build with gcc 13 by including <cstdint> + +Like other versions before, gcc 13 moved some includes around and as a +result <cstdint> 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 <cstdint> ++ + #define MKID(a, b, c, d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) + + #define ID_LSTAT_V1 MKID('S', 'T', 'A', 'T') |