commit: f9d28a0b7383df41bbfa37ab0d751457541ffd46 Author: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail <DOT> com> AuthorDate: Mon Jun 2 21:57:00 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <cstdint> and <stdint.h> have to be explicitly included. Signed-off-by: Kostadin Shishmanov <kostadinshishmanov <AT> 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 <AT> 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 <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>
