From patchwork Mon Jan 21 07:27:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 156153 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6070864jaa; Sun, 20 Jan 2019 23:28:29 -0800 (PST) X-Google-Smtp-Source: ALg8bN46oKk0H3MJwxQ95cM+3Mp27bmgWGbPGnJDK/LSJ018ZSsDgqUYEoMjbcOnPg8F2TsyDe54 X-Received: by 2002:a63:3c58:: with SMTP id i24mr27609026pgn.284.1548055709157; Sun, 20 Jan 2019 23:28:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548055709; cv=none; d=google.com; s=arc-20160816; b=rWC5EmKx0opEFyu94r1AO8V+vAUgJI/jZjWnBYvb7tqa7yj8eQsZpgjmBEAd60Y3m1 Sg4EYdZYy1ZUOIipTz/WjMUghDSWS29fBniwXyMMZLaPl9UNTIL13BGto3UuVVDT+Vb1 X7zZrKfpxr8dtbkJn3uHVj7B7qM2R4TJRqoMKwD/73s+YkA3ycx792XPrIpirwowGJfF bkLKyaUj071UphBRV9ENVJF0HbiItmzRDydvTt7UqGxArUwEywhvDS2Gv9koK9JZDpv3 c7tECBfNqFcxawsNEvLInf3HUaoDlMjVnAE9a5BFQ5+0QP8MZXdhoPiVBFlM8PeIjmbg BLrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=4UNi7CoocxKZjK+gdKEMVpRhAK48hvIS430bGtVGrDM=; b=I77YLRGh2ZPGDKDKDugARMjMe905Q7WyZpLBCpdEVIJfiCMNzhRggLGssRjn1HLFaL xI957kYMerP8SpGsiDD785jNIdYlGCILanKlUZsbJ367wNuci6y6GmyQYjLWKAx14uyZ YYPgJln36EQKIgrYRoesBUO0Gn5m3bzVQOTT86+MV1PEIMfpxpWo14hJnpW6MY8Q0CKo lXvEAeaHFkP3MrqY8+JyVyvLLh2kiutMIFvby5aHjCyw0wjgrX9y05YqQkCwzPNG6IFF q1b8MLH7nmuMlmo7kt3BuiFgMPv7Uptlk59wXDXDCD+NzLJHX+yPCcvZs/3J0gKNo0+N KbFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nSIYDgZu; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 3si12091521pla.240.2019.01.20.23.28.28; Sun, 20 Jan 2019 23:28:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nSIYDgZu; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9B63B7BF9D; Mon, 21 Jan 2019 07:28:26 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by mail.openembedded.org (Postfix) with ESMTP id 982086B7C2 for ; Mon, 21 Jan 2019 07:27:57 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id u18so9383726plq.7 for ; Sun, 20 Jan 2019 23:27:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lwxm7b7CdDLltLaCR4Lgn7KPDEzolyehNbcf7/5Tzvo=; b=nSIYDgZuvjquFKdfCvduvd8hGVYI5paMf4KvXdwizyRegXX0E9YJViSBstJ3ZiAfUk paGkchBOtLQjGknDnxx8Eexe1Vaz8y30iDROvw1KhA6HNCYDPyVqhl1CUV05tzTHCqRJ Rj+yNJoHpD+rPCELU2YIUpRSgLyo12fyfdFm5e+tSR3f6e+FIBConYHOlmts2U+V/Nsh LFcZD7KSohqugdIEPep6ultsgLKv/D9yGlANoucunj8o7gyGDGqfIiUdFKg6uJ8JyQ2Q yNE5EvZMCIyi/ivXgV8HRGEeBTVDxQxgnpJyDZSAX3xjmpJAw0XBMpHbM4GpmL936hHr XVeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lwxm7b7CdDLltLaCR4Lgn7KPDEzolyehNbcf7/5Tzvo=; b=jqCiyx05FqP/FYzDY0xJW3Ol+c98lI8EMot6RzgjCEiHlZ6buLH46eii9KStwAzCGa Z1CIypuVPgfYbwoE+WqaV8g3dcNreihRMUw7Tz7d6fCbxhaaEbtKY2WrGHXyjT+Lemfg wzvKGj/X72ACdhbYmwDboi6PO7pcgfy2Q3mNPPnNz1rNki3hBpShYEuZu50QTsctDoNQ rUdTlQk4DJCbNzgtdadPRoVG7PsqQw/T42OCyWepnUuet1QAdewnFzZH38MmGmPVDKxE TqwhQ1FOlsXVqnyFFxq/U0pEvVQZRjY8uamKf8z0lR/JM/oDq93X2j0jpcDZi5d/tsFP nu/w== X-Gm-Message-State: AJcUukfkyJg0IKprmxyCFJ+F+tRicsP3esjiLoIl2x1WEDllrwN+FWnd lvvrxIe0LZojvavQnZNyo6+zA7Obz7o= X-Received: by 2002:a17:902:24d:: with SMTP id 71mr28249001plc.225.1548055678435; Sun, 20 Jan 2019 23:27:58 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::b601]) by smtp.gmail.com with ESMTPSA id e16sm15239976pfn.46.2019.01.20.23.27.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Jan 2019 23:27:58 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sun, 20 Jan 2019 23:27:49 -0800 Message-Id: <20190121072749.15424-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121072749.15424-1-raj.khem@gmail.com> References: <20190121072749.15424-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/2] apt: Backport a patch to include std::array definition X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This partial backport helps compiling apt with clang/libc++ Signed-off-by: Khem Raj --- meta/recipes-devtools/apt/apt.inc | 1 + .../0001-Include-array.h-for-std-array.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-devtools/apt/apt/0001-Include-array.h-for-std-array.patch -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index bff59e521a..842c30240b 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -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" 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 @@ +From 4d64ec843185bf6fd1b85c3a6a4c4e3c968c8ab1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 Jan 2019 18:56:58 -0800 +Subject: [PATCH] Include 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' + std::array c_weekdays = {{ "sun", "mon", "tue", "wed", "thu", "fri", "sat" }}; + +Signed-off-by: Khem Raj +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 + #include + ++#include + #include + #include + #include +-- +2.20.1 +