diff options
| author |   Sam James <sam@gentoo.org> | 2022-05-14 01:38:06 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-05-14 01:38:06 +0000 |
| commit | 9b60f64b5be8e35a125b92cc0ef957f5e2186c7c (patch) | |
| tree | 58d8604a485c86808053c2396a12c0df0fd9dbbf /dev-util/android-tools | |
| parent | dev-util/diffoscope: add 212 (diff) | |
| download | gentoo-9b60f64b5be8e35a125b92cc0ef957f5e2186c7c.tar.gz gentoo-9b60f64b5be8e35a125b92cc0ef957f5e2186c7c.tar.bz2 gentoo-9b60f64b5be8e35a125b92cc0ef957f5e2186c7c.zip | |
dev-util/android-tools: fix build with GCC 12
Closes: https://bugs.gentoo.org/844127
Thanks-to: Mike Lothian <mike@fireburn.co.uk>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/android-tools')
| -rw-r--r-- | dev-util/android-tools/android-tools-31.0.3_p1.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild index ba179d04c56f..0f1abac32b14 100644 --- a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild +++ b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,6 +54,8 @@ src_prepare() { eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch" cd "${S}/vendor/boringssl" || die eapply "${S}/patches/boringssl/0011-Disable-Werror.patch" + cd "${S}/vendor/adb" || die + eapply "${FILESDIR}/${PN}-31.0.3_p1-gcc12.patch" cd "${S}" eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch" rm -r patches || die diff --git a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch new file mode 100644 index 000000000000..aa313daf9042 --- /dev/null +++ b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch @@ -0,0 +1,15 @@ +From 752fc3bd9a971858dbb7b51a0ef0289232e67e58 Mon Sep 17 00:00:00 2001 +From: Mike Lothian <mike@fireburn.co.uk> +Date: Sat, 14 May 2022 02:01:18 +0100 +Subject: [PATCH] Add functional include + +--- a/tls/include/adb/tls/tls_connection.h ++++ b/tls/include/adb/tls/tls_connection.h +@@ -19,6 +19,7 @@ + #include <stddef.h> + #include <stdint.h> + ++#include <functional> + #include <string_view> + #include <vector> + |