summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/apt
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-20 23:27:49 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-21 23:44:22 +0000
commitaab11d8d283fe2d1619eca20eee83bc5a3e230bd (patch)
tree5bee2ae5c1e50ff5f339617738463478802285c1 /meta/recipes-devtools/apt/apt
parent7ce6054039849259b7f8436d66600ba5e519f93f (diff)
downloadpoky-aab11d8d283fe2d1619eca20eee83bc5a3e230bd.tar.gz
apt: Backport a patch to include std::array definition
This partial backport helps compiling apt with clang/libc++ (From OE-Core rev: 50d62a99341d06b8cc0efa1da25cd271e3b6ea9b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt')
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Include-array.h-for-std-array.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-Include-array.h-for-std-array.patch b/meta/recipes-devtools/apt/apt/0001-Include-array.h-for-std-array.patch
new file mode 100644
index 0000000000..e4a8faa2b4
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt/0001-Include-array.h-for-std-array.patch
@@ -0,0 +1,35 @@
1From 4d64ec843185bf6fd1b85c3a6a4c4e3c968c8ab1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 20 Jan 2019 18:56:58 -0800
4Subject: [PATCH] Include <array.h> for std::array
5
6When compiling using clang/libc++ it fails to build because this header
7is not included, with libstdc++ this seems to be pulled in
8automatically.
9
10Fixes below error
11
12apt-pkg/contrib/strutl.cc:949:38: error: implicit instantiation of undefined template 'std::__1::array<const char *const, 7>'
13 std::array<char const * const, 7> c_weekdays = {{ "sun", "mon", "tue", "wed", "thu", "fri", "sat" }};
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16Upstream-Status: Backport [https://github.com/Debian/apt/commit/24a59c62efafbdb8387b2d3c5616b04b9fd21306]
17---
18 apt-pkg/contrib/strutl.cc | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
22index 60d0ca8..c2bfcbc 100644
23--- a/apt-pkg/contrib/strutl.cc
24+++ b/apt-pkg/contrib/strutl.cc
25@@ -21,6 +21,7 @@
26 #include <apt-pkg/fileutl.h>
27 #include <apt-pkg/error.h>
28
29+#include <array>
30 #include <algorithm>
31 #include <iomanip>
32 #include <locale>
33--
342.20.1
35