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

dev-util/android-tools: fix build with GCC 12

Browse Source 
Closes: https://bugs.gentoo.org/844127
Thanks-to: Mike Lothian <mike@fireburn.co.uk>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-05-14 01:38:06 +00:00
parent 83d407151a
commit 9b60f64b5b
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-util/android-tools/android-tools-31.0.3_p1.ebuild
View File

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

15
dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch Normal file
View File

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