| 1 |
commit: 9b60f64b5be8e35a125b92cc0ef957f5e2186c7c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 14 01:38:06 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 01:38:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b60f64b |
| 7 |
|
| 8 |
dev-util/android-tools: fix build with GCC 12 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/844127 |
| 11 |
Thanks-to: Mike Lothian <mike <AT> fireburn.co.uk> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/android-tools/android-tools-31.0.3_p1.ebuild | 4 +++- |
| 15 |
.../files/android-tools-31.0.3_p1-gcc12.patch | 15 +++++++++++++++ |
| 16 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index ba179d04c56f..0f1abac32b14 100644 |
| 20 |
--- a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild |
| 21 |
+++ b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2021 Gentoo Authors |
| 24 |
+# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=8 |
| 28 |
@@ -54,6 +54,8 @@ src_prepare() { |
| 29 |
eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch" |
| 30 |
cd "${S}/vendor/boringssl" || die |
| 31 |
eapply "${S}/patches/boringssl/0011-Disable-Werror.patch" |
| 32 |
+ cd "${S}/vendor/adb" || die |
| 33 |
+ eapply "${FILESDIR}/${PN}-31.0.3_p1-gcc12.patch" |
| 34 |
cd "${S}" |
| 35 |
eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch" |
| 36 |
rm -r patches || die |
| 37 |
|
| 38 |
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 |
| 39 |
new file mode 100644 |
| 40 |
index 000000000000..aa313daf9042 |
| 41 |
--- /dev/null |
| 42 |
+++ b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch |
| 43 |
@@ -0,0 +1,15 @@ |
| 44 |
+From 752fc3bd9a971858dbb7b51a0ef0289232e67e58 Mon Sep 17 00:00:00 2001 |
| 45 |
+From: Mike Lothian <mike@×××××××××××.uk> |
| 46 |
+Date: Sat, 14 May 2022 02:01:18 +0100 |
| 47 |
+Subject: [PATCH] Add functional include |
| 48 |
+ |
| 49 |
+--- a/tls/include/adb/tls/tls_connection.h |
| 50 |
++++ b/tls/include/adb/tls/tls_connection.h |
| 51 |
+@@ -19,6 +19,7 @@ |
| 52 |
+ #include <stddef.h> |
| 53 |
+ #include <stdint.h> |
| 54 |
+ |
| 55 |
++#include <functional> |
| 56 |
+ #include <string_view> |
| 57 |
+ #include <vector> |
| 58 |
+ |
Archives