From patchwork Sun May 20 22:04:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 136420 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3851217lji; Sun, 20 May 2018 15:04:51 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqqD3f01LPGDJ3bXt1NIUd9U7nIjIqCq0SFM6k/BjZ/ZWLqx96fX2nt7XvfAGY5AIVB61Aq X-Received: by 2002:a17:902:a986:: with SMTP id bh6-v6mr18279403plb.245.1526853891787; Sun, 20 May 2018 15:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526853891; cv=none; d=google.com; s=arc-20160816; b=m+JP0lEnxlFFlE70zP0YScPmy8wroK0rtIstFs03e5a0Iqm+rQstoAblNyhRlRwJNX uZ+tjJd9zBiOA1XgRosWSM1lAmeeWkTQbcQEnFLysRUBdXRdsN7zsAKN1PHqPb00bQQu aSuZZvfPia+l6QQUhVSHuEaz6lvIZ2/tpkP2lNp5gl23i7ybzvbUuIilhVbcTm3Kr8gh PnA/JMmQ5/CHvFP4y/CnlJU7tmADB+IWeHuIzrzHseUE/Id0Ytcu3kA2q6lLM4icDDP1 LW0XKLs4u/ROJ77ShGKmTuPFJT5ZOvJrwjrA39u1OmFF/5J/KnoL7pijdkppUkGJRyee jnWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=rxtk6XNbINoQlj59bfeXIGa0bjNGYdeRi+pTCTw2N9s=; b=dEmtMHjVmtVez4nzsPZ4FkdTh8YUt0GBmYGQC2zBWAacfmzlrEqmEfqPnz2AxC5REN LCGlzmjn/pqdkVonGH9NXB8+vdfXFiB2ZCEE2u+mui+NhaAZJZsoH02o4f3MN0PNSeab /9nXW4wrX6d8tmZw3voh87epinceuh4+dR5d2bB8CM5t8udm66gfidZXfCi832l30iUR C1hxrnc9Bwiy+IjYaV8mZaBUIZwlGo2jRU3e7mYiZUi81hHa4dhhbaz0Ch/7G1Zw944Q UJN+6JWfrSOfpf8zz7OjdNTYDGcl7ICdjDtMer2Xx2gW/3lTNPPfvBzuMjAqIVtpJ5UZ lDDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j1YMNonk; 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 99-v6si12247944plc.362.2018.05.20.15.04.50; Sun, 20 May 2018 15:04:51 -0700 (PDT) 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=j1YMNonk; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id DC2EF74D5D; Sun, 20 May 2018 22:04:44 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f43.google.com (mail-pg0-f43.google.com [74.125.83.43]) by mail.openembedded.org (Postfix) with ESMTP id 4F56774CB9 for ; Sun, 20 May 2018 22:04:42 +0000 (UTC) Received: by mail-pg0-f43.google.com with SMTP id a3-v6so557316pgt.13 for ; Sun, 20 May 2018 15:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=NBd7Ia/f6YHY3Qs6z8zPmvpPPArwNxCq1fe0SECx1tY=; b=j1YMNonk0//7IxkdrB9hrYjMKakCOLOLWk9tF1Vv6YxZyoYtt+F1VzWLr5H8e09G9y iLltIk1CvjZeatZZuaIMb3fCan+dz1iNQPH1e3S80VcQCrFsPxDvIzY17DcoX/DFz/66 XFzYCwoYoUP7UCvMaflp/iu6Q/faadiGKPWiMaDFjGDavY/InuMXXLoQ6BajqK69+l6q 6/gyAZWfXi8cnhE94K5CDsKxjhTwKZI6blcLCjLj6P3UMP83CPPQUrvgo48QPJjLMF8y 0rdew8Mm/UMat6NGhcMjw+aouHXk8K8kY9UNtduNxLd3QcPVM0lMdYAL359UPSX+EGhd R28A== 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; bh=NBd7Ia/f6YHY3Qs6z8zPmvpPPArwNxCq1fe0SECx1tY=; b=QZlFi+d6NMavYjm2vqQ1rOKnLzLGPmPBUSPHzx8zUHE5kvsO+b8Y/BJpu7SSuCFPO0 cehQ7dXt+Q/EvFfarKc4gUI6xrugK4YxxiRb3nfbokIHnvrdNeF5dcTIPwYRN466WCFT +sRcvQ1N3mPV22vxDUP0eMdGx/rqtDpDMnPlwQRfO/szBBuhrgsfbHRXdxHK2c2J1dmI H2ZBbeE/w1MbFeWocoQuvazUdgoMH4r6FemdNq2kK0xrTL+l1XBBLLUOJutXrvF0+jdi y/lizL36bUv+re50RvXKEZ1K4T+n7K3JxBb4ATwOtoHkrZXIbGgvyxyUxch8wyh7aM8f uBVg== X-Gm-Message-State: ALKqPwfJUkzRKC1q7mDs3UE8yFVPVqYnUG7qxzS34EHlY/FKmYoxdFtZ D1wT0FY+J14m1Jc+dhn/VW0VkA== X-Received: by 2002:a62:c615:: with SMTP id m21-v6mr17555292pfg.232.1526853883653; Sun, 20 May 2018 15:04:43 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id c18-v6sm16667913pgu.63.2018.05.20.15.04.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 15:04:42 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sun, 20 May 2018 15:04:41 -0700 Message-Id: <20180520220442.16092-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [OE-core] [PATCH 1/2] acpica: Upgrade to 20180508 release 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Drop upstreamed patches Signed-off-by: Khem Raj --- ...{acpica_20170303.bb => acpica_20180508.bb} | 11 +++---- ...-add-support-for-X32-ABI-compilation.patch | 31 ------------------- .../manipulate-fds-instead-of-FILE.patch | 29 +++++++++-------- 3 files changed, 19 insertions(+), 52 deletions(-) rename meta/recipes-extended/acpica/{acpica_20170303.bb => acpica_20180508.bb} (84%) delete mode 100644 meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/acpica/acpica_20170303.bb b/meta/recipes-extended/acpica/acpica_20180508.bb similarity index 84% rename from meta/recipes-extended/acpica/acpica_20170303.bb rename to meta/recipes-extended/acpica/acpica_20180508.bb index 51ae77b784..dfa9a18ccb 100644 --- a/meta/recipes-extended/acpica/acpica_20170303.bb +++ b/meta/recipes-extended/acpica/acpica_20180508.bb @@ -17,12 +17,11 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "bison flex" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ - file://rename-yy_scan_string-manually.patch \ - file://manipulate-fds-instead-of-FILE.patch;striplevel=2 \ - file://0001-Linux-add-support-for-X32-ABI-compilation.patch \ - " -SRC_URI[md5sum] = "48ef4314fb4ffdd0c96f14dcf20544e1" -SRC_URI[sha256sum] = "b2d81e84107ac9a02be86ea43cbea7afa8fd4b4150270bc88c2d4c9fea0b8aad" + file://rename-yy_scan_string-manually.patch \ + file://manipulate-fds-instead-of-FILE.patch \ + " +SRC_URI[md5sum] = "31691e2eb82b2064f78536a3423c18d6" +SRC_URI[sha256sum] = "5d8fc9d9db9e04830d40bec9add04b21c05d466e0187d354815006fdd823cf15" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix2-${PV}" diff --git a/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch b/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch deleted file mode 100644 index df74200068..0000000000 --- a/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d22241efc0708c9799f17a20eabb52a48d6d6ea1 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Tue, 2 Jan 2018 12:35:32 +0800 -Subject: [PATCH] Linux: add support for X32 ABI compilation - -X32 follows ILP32 model. Check for ILP32 as well when checking for -x86_64 to ensure the defines are correct for X32 ABI. - -Upstream-Status: Submitted [https://github.com/acpica/acpica/pull/348] - -Signed-off-by: Anuj Mittal ---- - source/include/platform/aclinux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h -index 75b1d82..6b8ff73 100644 ---- a/source/include/platform/aclinux.h -+++ b/source/include/platform/aclinux.h -@@ -315,7 +315,7 @@ - #define ACPI_FLUSH_CPU_CACHE() - #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) - --#if defined(__ia64__) || defined(__x86_64__) ||\ -+#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\ - defined(__aarch64__) || defined(__PPC64__) ||\ - defined(__s390x__) - #define ACPI_MACHINE_WIDTH 64 --- -2.7.4 - diff --git a/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch b/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch index 5610ed9beb..d8b5f9aa8a 100644 --- a/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch +++ b/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch @@ -1,4 +1,4 @@ -From 69171c22f3872ecb4c1ab27985e93ca44084595e Mon Sep 17 00:00:00 2001 +From 540d80469e6a7dce6baf7214df90e86daffc5175 Mon Sep 17 00:00:00 2001 From: Fan Xin Date: Mon, 5 Jun 2017 13:26:38 +0900 Subject: [PATCH] aslfiles.c: manipulate fds instead of FILE @@ -16,18 +16,20 @@ Signed-off-by: Patrick Ohly Rebase on acpica 20170303 Signed-off-by: Fan Xin + --- - acpica-unix2-20170303/source/compiler/aslfiles.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) + source/compiler/aslfiles.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) -diff --git a/acpica-unix2-20170303/source/compiler/aslfiles.c b/acpica-unix2-20170303/source/compiler/aslfiles.c -index 809090c..97898b1 100644 ---- a/acpica-unix2-20170303/source/compiler/aslfiles.c -+++ b/acpica-unix2-20170303/source/compiler/aslfiles.c -@@ -44,6 +44,10 @@ +diff --git a/source/compiler/aslfiles.c b/source/compiler/aslfiles.c +index 82865db..cc072dc 100644 +--- a/source/compiler/aslfiles.c ++++ b/source/compiler/aslfiles.c +@@ -43,6 +43,11 @@ + #include "aslcompiler.h" #include "acapps.h" - #include "dtcompiler.h" ++#include "dtcompiler.h" +#include +#include +#include @@ -35,7 +37,7 @@ index 809090c..97898b1 100644 #define _COMPONENT ACPI_COMPILER ACPI_MODULE_NAME ("aslfiles") -@@ -607,6 +611,8 @@ FlOpenMiscOutputFiles ( +@@ -606,6 +611,8 @@ FlOpenMiscOutputFiles ( if (Gbl_DebugFlag) { @@ -44,7 +46,7 @@ index 809090c..97898b1 100644 Filename = FlGenerateFilename (FilenamePrefix, FILE_SUFFIX_DEBUG); if (!Filename) { -@@ -618,10 +624,10 @@ FlOpenMiscOutputFiles ( +@@ -617,10 +624,10 @@ FlOpenMiscOutputFiles ( /* Open the debug file as STDERR, text mode */ Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Filename = Filename; @@ -58,7 +60,7 @@ index 809090c..97898b1 100644 { /* * A problem with freopen is that on error, we no longer -@@ -635,6 +641,8 @@ FlOpenMiscOutputFiles ( +@@ -634,6 +641,8 @@ FlOpenMiscOutputFiles ( exit (1); } @@ -67,6 +69,3 @@ index 809090c..97898b1 100644 AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT); AslCompilerFileHeader (ASL_FILE_DEBUG_OUTPUT); } --- -1.9.1 - From patchwork Sun May 20 22:04:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 136421 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3851414lji; Sun, 20 May 2018 15:05:11 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoYpuhesiNBP4V9rdcArkDkkqVHdhkxSlG40JaNx85McnVAFzlsyoYinbGV+BHOirRJv7fn X-Received: by 2002:a17:902:7b86:: with SMTP id w6-v6mr18552732pll.183.1526853911390; Sun, 20 May 2018 15:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526853911; cv=none; d=google.com; s=arc-20160816; b=w38tvYDUfkMI1aYfv1JmuYRntK1sB4dsPlEaw1j0GQyjmUPuatDk+nXTrWQXev6odZ TMr2B/g+eZ2YQsU6bZ7z253qOWo9/EPvaiJekCj23g8pXCbsyeWVgqbgSPnVBBA4PpPN CPlCZh81QhSt4yqqATBKjmo0WvUTLm2XSxvac26FE1xgOMaeFrRDMbwlOQMije1lS2tp 7615fZrltaYCOfrpyeEsPFlHYJ8Z1wW+8JSgzuL0Vudd/lrMhz4EIT3uGftnPLvS6Ab9 82yIA9heCSD/rDlAHVgK2VLzi56rMsqpdUuL+ixtdkw+P9an4WlSBTnSFnfxLbqjSjVf o5Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Oz/A4O9GDKP6hT361oaZ2mqX8OrZKi5MirAjRcIPIiU=; b=ruYD8DcHXlroL42qkzN826dlc3ewBb+ti9axxNlvzwQ9IJV4eXPKjU0zS0oPZ513/h BuvxK9FPfV4udxge7qxQtHU4u4kE7r4mX4y/+xK1LreDBwy4YIYyTgEOcMCAmz0HRB+B wvp3OtbFsJeQIzILa7/CV05uWDUpxsW+S1Tl3E5QUz04axvQR4GYKvYHYIi6ZM4gzHOX UshPb+9OE0wJidEGmx6SmIBgS8aNd26DEuOzbopaqchKaPLALcpXpTU3iJdqzd0Ds9GX d9eZkgNMrFGyQQ7Cah5GDBpaHKX81iyAkjHa/z9EGPimpq1sdxZRCEOU0jXYPsD5Xt5h c3gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=n3y7Lk9H; 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 w65-v6si12763320pfa.18.2018.05.20.15.05.11; Sun, 20 May 2018 15:05:11 -0700 (PDT) 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=n3y7Lk9H; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E305774D5E; Sun, 20 May 2018 22:05:08 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id E945F74CB9 for ; Sun, 20 May 2018 22:04:43 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id a14-v6so6116187pfi.1 for ; Sun, 20 May 2018 15:04:45 -0700 (PDT) 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; bh=9qK0h0ciky00gPTvAsdzB9vMbCYJEpNk/VaFoel3dPs=; b=n3y7Lk9HxfgnBb1SifIUH8JX4ejq1+/cfmalCqrw7op8O/OCJ249t5TRO55bbMNhap 5yddYdsKVacRwOB6SXB8afbdnNWuRYHq5/DmuNtpW0v2HlBvG6vHn0FUSFz0QdPUHjHw Tk6h1KxNOvmaT5B7QAazGoPXnsOtmc1rNO84heeDoYTMvC63E5+WkQaPhELilN0FasdV QQAMmhGKrLpoDsq/1DhvFPSN+YssGnHssKRmtFJiyHsYoYGRJkAGRsTpa/Q1vxk8NkRF OGIhVgN2vn1i4wJHRA7EKuO3V34b4mHmqlKhDliRIjabDlCCrBlU/HIE5Os5T8sXsJYZ MxtA== 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; bh=9qK0h0ciky00gPTvAsdzB9vMbCYJEpNk/VaFoel3dPs=; b=tZrIYkel/hgrDRm6h4qlH/NNSUB27RKawulh1SX7GoSr3Cjeo5SHMc2S4TlwnfIu/e m0IxECR1+jynxynNpbeO4zrII7EvZaNgAhs2udP0CS7HHYSuntKceU78kG6sUrgnXfUm 5jIzQ0djYGvP499q4v2UlJ+Odi/10EEVVsGpD8WnVo9pemLfHpM9B0Pnoty+fthI9vu/ z6D4EjyOt/TY6ECFfM1H1fd+K+2V0jyzaFHiQFwDbc2cdiTBTOXx+qP3JuMnvLUnfWEE NAhXOKHwn9SKqqHy4GhnewTe9yhp1LvN18ApqYvHFCefZD0s2Fg3wQBX1pVq3RNejxOn unEA== X-Gm-Message-State: ALKqPwfesrCk1Fw5MDxxsbAVfVkVmealGeMNjqBB/BuJmgPmOWskuXPD HLTNhMtLxcs2TUtzLpj/q+s4JA== X-Received: by 2002:a63:584:: with SMTP id 126-v6mr2451638pgf.272.1526853884397; Sun, 20 May 2018 15:04:44 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id c18-v6sm16667913pgu.63.2018.05.20.15.04.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 15:04:43 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sun, 20 May 2018 15:04:42 -0700 Message-Id: <20180520220442.16092-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180520220442.16092-1-raj.khem@gmail.com> References: <20180520220442.16092-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 2/2] webkitgtk: Upgrade to 2.20.2 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Patch it to build with clang Signed-off-by: Khem Raj --- .../0012-soup-Forward-declare-URL-class.patch | 31 +++++++++++++++++++ ...ebkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} | 7 +++-- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch rename meta/recipes-sato/webkit/{webkitgtk_2.20.1.bb => webkitgtk_2.20.2.bb} (95%) -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch b/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch new file mode 100644 index 0000000000..c689117650 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch @@ -0,0 +1,31 @@ +From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 May 2018 14:28:27 -0700 +Subject: [PATCH] soup: Forward declare URL class + +This helps getting away with compiler errors seen with clang + +/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: +error: unknown type name 'URL' + static std::optional checkTLSErrors(const URL&, +GTlsCertificate*, GTlsCertificateFlags); + ^ +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h +index 03bd72ba..7ca8792d 100644 +--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h ++++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h +@@ -43,6 +43,7 @@ namespace WebCore { + + class CertificateInfo; + class ResourceError; ++class URL; + struct SoupNetworkProxySettings; + + class SoupNetworkSession { diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.2.bb similarity index 95% rename from meta/recipes-sato/webkit/webkitgtk_2.20.1.bb rename to meta/recipes-sato/webkit/webkitgtk_2.20.2.bb index 360ab8e69b..a3d62e7ba7 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.20.2.bb @@ -21,10 +21,11 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ file://detect-gstreamer-gl.patch \ + file://0012-soup-Forward-declare-URL-class.patch \ " -SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4" -SRC_URI[sha256sum] = "43e43285fa4e393080cc4fbd5ad8644749a75b1e0b811b230b63ae56806c8959" +SRC_URI[md5sum] = "3fdda40dc10eb2a00d5fba4219b83967" +SRC_URI[sha256sum] = "dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc @@ -85,7 +86,7 @@ EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " -EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " +#EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_aarch64 = " -DWTF_CPU_ARM64_CORTEXA53=ON"