summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch')
-rw-r--r--dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch b/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch
new file mode 100644
index 000000000000..79bd52c4c634
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch
@@ -0,0 +1,45 @@
+From 805c7e385123c6c142c8fec941406fea62af4459 Mon Sep 17 00:00:00 2001
+From: Christopher Fore <csfore@posteo.net>
+Date: Sat, 9 Dec 2023 15:07:12 -0500
+Subject: [PATCH] dev-util/android-tools: Add patch to fix compilation on GCC 14
+
+https://github.com/gentoo/gentoo/pull/34201
+---
+
+diff --git a/vendor/adb/client/incremental_utils.cpp b/vendor/adb/client/incremental_utils.cpp
+index 2f6958b..67f21a1 100644
+--- a/vendor/adb/client/incremental_utils.cpp
++++ b/vendor/adb/client/incremental_utils.cpp
+@@ -24,6 +24,7 @@
+ #include <ziparchive/zip_archive.h>
+ #include <ziparchive/zip_writer.h>
+
++#include <algorithm>
+ #include <array>
+ #include <cinttypes>
+ #include <numeric>
+diff --git a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
+index 37f28e1..0db82e5 100644
+--- a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
++++ b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
+@@ -17,6 +17,8 @@
+
+ #include <liblp/liblp.h>
+
++#include <algorithm>
++
+ #include "images.h"
+ #include "utility.h"
+ #include "writer.h"
+diff --git a/vendor/core/fs_mgr/liblp/utility.cpp b/vendor/core/fs_mgr/liblp/utility.cpp
+index d8e171b..70c7b79 100644
+--- a/vendor/core/fs_mgr/liblp/utility.cpp
++++ b/vendor/core/fs_mgr/liblp/utility.cpp
+@@ -25,6 +25,7 @@
+ #include <sys/ioctl.h>
+ #endif
+
++#include <algorithm>
+ #include <map>
+ #include <string>
+ #include <vector>