mirror of
https://git.yoctoproject.org/poky
synced 2026-04-03 20:02:24 +02:00
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>
This commit is contained in:
@@ -13,6 +13,7 @@ SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/${BPN}/${P
|
||||
file://disable-test.patch \
|
||||
file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \
|
||||
file://0001-apt-1.2.12-Fix-musl-build.patch \
|
||||
file://0001-Include-array.h-for-std-array.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "ce8f9ab11f4fd0a08ec73eaffd75c8f0"
|
||||
SRC_URI[sha256sum] = "fa1311a9ce00e72379a0a3bc6d240ba30c0968cfbbb3472859e50b99e24e9598"
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 4d64ec843185bf6fd1b85c3a6a4c4e3c968c8ab1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 20 Jan 2019 18:56:58 -0800
|
||||
Subject: [PATCH] Include <array.h> for std::array
|
||||
|
||||
When compiling using clang/libc++ it fails to build because this header
|
||||
is not included, with libstdc++ this seems to be pulled in
|
||||
automatically.
|
||||
|
||||
Fixes below error
|
||||
|
||||
apt-pkg/contrib/strutl.cc:949:38: error: implicit instantiation of undefined template 'std::__1::array<const char *const, 7>'
|
||||
std::array<char const * const, 7> c_weekdays = {{ "sun", "mon", "tue", "wed", "thu", "fri", "sat" }};
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Backport [https://github.com/Debian/apt/commit/24a59c62efafbdb8387b2d3c5616b04b9fd21306]
|
||||
---
|
||||
apt-pkg/contrib/strutl.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
|
||||
index 60d0ca8..c2bfcbc 100644
|
||||
--- a/apt-pkg/contrib/strutl.cc
|
||||
+++ b/apt-pkg/contrib/strutl.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <apt-pkg/fileutl.h>
|
||||
#include <apt-pkg/error.h>
|
||||
|
||||
+#include <array>
|
||||
#include <algorithm>
|
||||
#include <iomanip>
|
||||
#include <locale>
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Reference in New Issue
Block a user