summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-05-27 00:48:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-28 06:41:02 +0100
commit06667ed5d4fc2dccf51ea7716acb7e7ab56ae936 (patch)
tree47f096b77ce1fe788e5126a46ba2b09878302d9b
parent1ccfa5515674f42cc29209a833b5cea99122dbca (diff)
downloadpoky-06667ed5d4fc2dccf51ea7716acb7e7ab56ae936.tar.gz
apt: Add missing <array> header
This issue is seen with clang/libc++ (From OE-Core rev: 65e9606bae6bcd849e3e30f3ce093ee64838b774) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch32
-rw-r--r--meta/recipes-devtools/apt/apt_2.2.3.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch b/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch
new file mode 100644
index 0000000000..cfee50c7a0
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch
@@ -0,0 +1,32 @@
1From f999aeb5ceb77b81c36e6a55300a521aaa2da882 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 26 May 2021 22:12:46 -0700
4Subject: [PATCH] aptwebserver.cc: Include <array>
5
6This helps getting std::array definition
7
8Fixes
9test/interactive-helper/aptwebserver.cc:36:55: error: constexpr variable cannot have non-literal type 'const std::array<std::array<const char *, 2>, 6>'
10 constexpr std::array<std::array<char const *,2>,6> htmlencode = {{
11
12Upstream-Status: Submitted [https://github.com/Debian/apt/pull/133]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 test/interactive-helper/aptwebserver.cc | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
19index 58ba54f84..0e030c7e9 100644
20--- a/test/interactive-helper/aptwebserver.cc
21+++ b/test/interactive-helper/aptwebserver.cc
22@@ -22,6 +22,7 @@
23 #include <unistd.h>
24
25 #include <algorithm>
26+#include <array>
27 #include <fstream>
28 #include <iostream>
29 #include <list>
30--
312.31.1
32
diff --git a/meta/recipes-devtools/apt/apt_2.2.3.bb b/meta/recipes-devtools/apt/apt_2.2.3.bb
index ff9270c4b3..fe00fb03ca 100644
--- a/meta/recipes-devtools/apt/apt_2.2.3.bb
+++ b/meta/recipes-devtools/apt/apt_2.2.3.bb
@@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
13 file://0001-srvrec-Keep-support-for-older-resolver.patch \ 13 file://0001-srvrec-Keep-support-for-older-resolver.patch \
14 file://0001-cmake-Do-not-build-po-files.patch \ 14 file://0001-cmake-Do-not-build-po-files.patch \
15 file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \ 15 file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \
16 file://0001-aptwebserver.cc-Include-array.patch \
16 " 17 "
17 18
18SRC_URI_append_class-native = " \ 19SRC_URI_append_class-native = " \