gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 12:58:16 -07:00
Code Issues Projects Releases Wiki Activity

dev-util/android-tools: fix building with gcc 16

Browse Source 
More libstdc++ changes landed upstream which shuffled some things
around again, so <cstdint> and <stdint.h> have to be explicitly
included.

Signed-off-by: Kostadin Shishmanov <kostadinshishmanov@protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42415
Closes: https://github.com/gentoo/gentoo/pull/42415
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Kostadin Shishmanov
2025-06-03 00:57:00 +03:00
committed by Sam James
parent 1b666d5fbb
commit f9d28a0b73
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-util/android-tools/android-tools-35.0.2.ebuild
View File

@@ -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"

27
dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch Normal file
View File

@@ -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 <stdint.h>
+
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 <cstdint>
#include <cstdio>
#include <ctime>