Skip to contentSkip to conversation

apt: Add missing <array> header

PATCH New Khem Raj 1 participant 1 message May 27, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 apt: Add missing <array> header

This issue is seen with clang/libc++

---
 .../0001-aptwebserver.cc-Include-array.patch  | 32 +++++++++++++++++++
 meta/recipes-devtools/apt/apt_2.2.3.bb        |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch
meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch new file +32 -0
new file mode 100644
index 0000000000..cfee50c7a0
@@ -0,0 +1,32 @@
+From f999aeb5ceb77b81c36e6a55300a521aaa2da882 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 26 May 2021 22:12:46 -0700
+Subject: [PATCH] aptwebserver.cc: Include <array>
+
+This helps getting std::array definition
+
+Fixes
+test/interactive-helper/aptwebserver.cc:36:55: error: constexpr variable cannot have non-literal type 'const std::array<std::array<const char *, 2>, 6>'
+   constexpr std::array<std::array<char const *,2>,6> htmlencode = {{
+
+Upstream-Status: Submitted [https://github.com/Debian/apt/pull/133]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ test/interactive-helper/aptwebserver.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
+index 58ba54f84..0e030c7e9 100644
+--- a/test/interactive-helper/aptwebserver.cc
++++ b/test/interactive-helper/aptwebserver.cc
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ 
+ #include <algorithm>
++#include <array>
+ #include <fstream>
+ #include <iostream>
+ #include <list>
+-- 
+2.31.1
+
meta/recipes-devtools/apt/apt_2.2.3.bb +1 -0
index ff9270c4b3..fe00fb03ca 100644
@@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
            file://0001-srvrec-Keep-support-for-older-resolver.patch \
            file://0001-cmake-Do-not-build-po-files.patch \
            file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \
+           file://0001-aptwebserver.cc-Include-array.patch \
            "
 
 SRC_URI_append_class-native = " \
Signature · 1 line
2.31.1