From patchwork Tue Sep 25 13:43:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 147428 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp747720lji; Tue, 25 Sep 2018 06:43:59 -0700 (PDT) X-Google-Smtp-Source: ACcGV61U5HCv4x6sb7g71SFfLxJnE9/c7tvi9D0EWih6isxydwPR5bobfc7NrYrXrS8aUJug3JFc X-Received: by 2002:a17:902:9a45:: with SMTP id x5-v6mr991121plv.213.1537883039049; Tue, 25 Sep 2018 06:43:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537883039; cv=none; d=google.com; s=arc-20160816; b=eLzkCemhMf8AgX74OAfMHq2lQZtlPHhln7kCS90yS4+WoeTyBOPBXyXWCyOsFpdjYQ xXL20S3gSYSYN68jK3c8qfB+VGl3gI/Z+feFId4IkHLxP59bnBWOVrsAR01oYE9LqsIs XaNR4YwdC7MUGPncHwFAKeWDy3fTvp8hQ2WZOoxnFxu0Y06RnHNdp/sqD8b0RcdZnr/l i8V+WBnjcRMZDzqzwIgOLkuegiJGCh3KKRVYsoM4GHuYBTp44LFR0YI86mukrHvoLpUD CeUWyoaNVzs9T+dH9OrKsCYOZw7Zo3IggUO4TBoW63cOVFHh9AAN3DnXp5jJ4yHuGywg +2BA== 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; bh=2mdujth8/X5900oe2Wjcq5hcdxPQr+WU3TDxk3wrScw=; b=dl7MQSYOMLHP39vy7rQpxGsHae15sRx71I5zkM7+WuOvdQEDKMNB5k9ekQ2FrXL/tP IAYQW4P1tb1roSnGfXCJy0/ZXh67hjTMPHjRmaE/n6jRGkPk8uJtGq9lE4Brkqn0NWgZ AkCHi+FjpGhd1+IUA9ObzEC96J/DByvFBE2QZhIz1nHLXNX71M9MwVqjleGuzfBX1FNo ZTE/UOntKHxXKk9rnxQ8oPYanDyxWIrzzK2BcrgQQH6kscz1TjrDcabxlEL3xV0S9azR DeiQK0dSv42ppA3l3gBHHVCU1GuPJGJB+Cpcx2NQannONXSjU28lIOE92GH51MBkGPUC 50QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=IHhOwSXz; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z1-v6si2444202pgg.641.2018.09.25.06.43.58; Tue, 25 Sep 2018 06:43:59 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=IHhOwSXz; 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=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7E05C793DC; Tue, 25 Sep 2018 13:43:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mail.openembedded.org (Postfix) with ESMTP id 080596FFFE for ; Tue, 25 Sep 2018 13:43:52 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id q8-v6so13722377wmq.4 for ; Tue, 25 Sep 2018 06:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=MvlmzAIOsW6IylwYJvGWCibZ0FOVEq44fjNZ3IXI40c=; b=IHhOwSXz4gnUpxVvkpghgLQyZU8l/or56+FOhBLI4k8SNUlG3NEHpFFlpXButuzi1s N1gkoyaw1iXMhr3XDHQcZ3Zhxj9w3WcaX/PVR4kgwh4GBXJ5FJc4kXNKYkaEGJhOSE4D egbPLA5SUiHsWdjUXVejtPlC8iKElDqBmtuf//TrEJexsBxsjzkB51mnUHQQordgCuT2 ctkjjqye9u18KquEt6eQSjON4wtl9FTX1l7dnRLhsBv3SQR4fIajQ71FWDd5Cv2s2Xrl 0apSddosMOU30HvFauSlyqAxg3fk+AbDw6upEAvSvZCH7trjgNZEqSbQMBYSIDbIk6OX yhxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=MvlmzAIOsW6IylwYJvGWCibZ0FOVEq44fjNZ3IXI40c=; b=CC+io1RGg+fm0xkIWlAE+c3SuxDFK7RfmyR4xIsG8k8KFwEwXdLReu3Xzl28S/gbOG LfyPD2mSgclmIgbsGOfHRj4zMcw0f0wEScTVqQYpkRfhIHwnYpeFuBcDz8X9ug0/+kY4 /kVa+Dnv5slkMK8/jNQfOsOefD+42+N/l7EUiXPTomSeROyOyN5Sj3anUygO9l9CxRPs kldEi4KqjtmAizqfJCBqUVJmWB0Wd6fLxKQvyRiPqTneCHMJRKe+xGeL+FtvdQQJclmx JSTQ+SxLmrnhLNKxi/edxR9rwJalvx6oZk/BiCjVcuOV9PheOrnct9qqaiQ3qc/IPg2B LyLw== X-Gm-Message-State: ABuFfohl7QlPWHqOE82z+6ynKu6ldMe+px1Yy2pdiiV80JxMOo4JkSfg zUUiyPjhwFSNEjofFPYbfHiMZ7DlIpM= X-Received: by 2002:a1c:2d54:: with SMTP id t81-v6mr783001wmt.31.1537883032938; Tue, 25 Sep 2018 06:43:52 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b21-v6sm1852340wmj.28.2018.09.25.06.43.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 06:43:51 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Sep 2018 14:43:43 +0100 Message-Id: <20180925134348.5562-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/6] siteinfo: generalise siteinfo 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 Signed-off-by: Ross Burton --- meta/classes/siteinfo.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 4698e6e474d..e80835605fb 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -15,7 +15,7 @@ # It is an error for the target not to exist. # If 'what' doesn't exist then an empty value is returned # -def siteinfo_data(d): +def siteinfo_data_for_machine(hostarch, hostos, d): archinfo = { "allarch": "endian-little bit-32", # bogus, but better than special-casing the checks below for allarch "aarch64": "endian-little bit-64 arm-common arm-64", @@ -131,8 +131,6 @@ def siteinfo_data(d): locs = { "archinfo" : archinfo, "osinfo" : osinfo, "targetinfo" : targetinfo, "d" : d} archinfo, osinfo, targetinfo = bb.utils.better_eval(call, locs) - hostarch = d.getVar("HOST_ARCH") - hostos = d.getVar("HOST_OS") target = "%s-%s" % (hostarch, hostos) sitedata = [] @@ -148,6 +146,9 @@ def siteinfo_data(d): bb.debug(1, "SITE files %s" % sitedata); return sitedata +def siteinfo_data(d): + return siteinfo_data_for_machine(d.getVar("HOST_ARCH"), d.getVar("HOST_OS"), d) + python () { sitedata = set(siteinfo_data(d)) if "endian-little" in sitedata: From patchwork Tue Sep 25 13:43:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 147429 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp748032lji; Tue, 25 Sep 2018 06:44:16 -0700 (PDT) X-Google-Smtp-Source: ACcGV63PxRxqZkJjF/tLyCd70FJ7z/WERSMFpA0W/jTg5XFrokMU8itFNaU4NLHlnBBE/AcoRmTl X-Received: by 2002:a63:2020:: with SMTP id g32-v6mr1181285pgg.235.1537883055903; Tue, 25 Sep 2018 06:44:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537883055; cv=none; d=google.com; s=arc-20160816; b=l8+EVGqGR5IlhQ2JJre/iOVCxy4T7JkOayZwmtdU5YwiiD+5PesYPBLEhEC8LUQGCD MWpmb1QQIhT6mHpnuOaei79x+juPS93m63b5HazQG7GLm3q/bc+m6CIFVn7IuDj4edXl Ug/gkPBX6SpDdwzm8K9FtM+kIRxguL7nwuQaIMAVJzlwKbIazHuBpxMnAm8hKuXolD5c 2ZyaZueGncW2si0rISJuhQIsNI1TTLs+J7akWHXhodOelJZxZDXihKRmb5N0w/iIgL8Z UuTYzmI34j60W72DFhmwMZ0Vnjq+B50WVRUKSjbw4QVsXkakAkkrKGRGBpLfIDt81kec Lg0w== 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; bh=L3J9sPs4vBJEaJKcEUEvxWKry/8syf6aBKRfr/LGBFk=; b=puz29iYp6cPFBcvrIqs/XogzRE6TB2YFV6CHchsnGEaGXyWhDuyimdFmV7RZk/qsk3 9feTiJxuWa/TTSOPoiMBjFuE8N44PFSRIt3y3hNZOGDtsBij/OVpJ/ij5OxSI207LkOy uQ3eUo5sz85oWzbC5caCNcMHrgBQjtWr4Kl1awzEAI6Hh9GD1tDL+0KZ8QbJ744HV1LR h410y2cFmSGFmUhVXhWiEdSSb1aRMRRh3KfqHt1Hfnn/bLWCJdADffgovChGbVT+NrM/ m42pONtuz/QLjzIeGhpBohzuquc1kGbe29Jz9ZUKajzZTBIugQo/C8pmda9K42tHkiZ0 fjHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=2IBqv5uB; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id j6-v6si2489434pgb.62.2018.09.25.06.44.15; Tue, 25 Sep 2018 06:44:15 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=2IBqv5uB; 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=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BF1947949C; Tue, 25 Sep 2018 13:44:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mail.openembedded.org (Postfix) with ESMTP id 23C696FFFE for ; Tue, 25 Sep 2018 13:43:54 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id o16so10120945wrx.2 for ; Tue, 25 Sep 2018 06:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=UTdOlImzrbvrgdcYqDPkjaSREHA6eSBgVWPND00yW5k=; b=2IBqv5uBQj5kdqYO1bCUjhAsWnJXrRZ+TQE/Cj3G3+CVLwei5IEfiUu2MJ5kz4LNy3 GQcN9zI8Skhml2t/K+br/0m58RA7kRteG5dHba9cOdjwp92mjhf2DeMEx2We3Ae4mA3X QOdp8qrsbGKP/yWL0Jd986LRAVY9KfmWcf0Yoc9d67EIIf5NtGPFp5PeFus+MTYtWvLH kdyAGDmle8tFXEJR3YdGbHfdXVUh0q8Kbt4I4uGefSpxQzLq9IbszMCNMSF+tC/IMz8k z2ZEL80ElralisVYH+Hdq6TM9RmpET+lyV+ozPBJ2szFJa0EXXOABA9Y8WkuQ/VBjW4H BWPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=UTdOlImzrbvrgdcYqDPkjaSREHA6eSBgVWPND00yW5k=; b=c8WLTIu035onB6aKYACGCjdRjL36GpTMHYFF5Zj1HntA3qF6zxKQEICSy60FyGyLuT o9evYhgDtngAkgttorCttMwX8jyszwzo5IerewPdpef0AICN1+aUglfONGGdFhcmPaJ5 jof4c8iEtoiGGRj0d3uTNLtYzUw6NEX7U5Kzn1vMsXG+LqJgiQ8pAfSZkBKwYxXiCXxX upi7FFgxaTSL3NTzKFtr4umvqpMhzYnIR9jQ/1q9lkKRcEUEuOwfBdoCv5MqudnUuDRy ZmXj5i8hZ0I2vlZJ6GvumENoMtGy1q49EFI5T/gOjBqn9shbuBUdGONh4gFBKNfM0mw0 lC1g== X-Gm-Message-State: ABuFfoiTnGY80uLySnRe+bdlA7fakQ49G8E3QH/WJ5SiI6DoI8l/Uit9 UAnc7dIlvXN47p5+XBOkWmlGElTbqEA= X-Received: by 2002:adf:9304:: with SMTP id 4-v6mr1131052wro.129.1537883034359; Tue, 25 Sep 2018 06:43:54 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b21-v6sm1852340wmj.28.2018.09.25.06.43.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 06:43:53 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Sep 2018 14:43:44 +0100 Message-Id: <20180925134348.5562-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180925134348.5562-1-ross.burton@intel.com> References: <20180925134348.5562-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/6] meson: squash the architecture warning patches together 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 Instead of one patch to change a warning into an exception and another to change the message, squash the patches together as neither of the are acceptable upstream. Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/meson.inc | 1 - .../0002-Make-CPU-family-warnings-fatal.patch | 4 +-- ...r-to-our-wiki-instead-of-Meson-bug-system.patch | 38 ---------------------- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index e7f999a205d..cfb831b106f 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -10,7 +10,6 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ file://0003-native_bindir.patch \ file://0002-Make-CPU-family-warnings-fatal.patch \ - file://0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch \ file://0001-Support-building-allarch-recipes-again.patch \ " SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" diff --git a/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch index a6c1b25c46b..ca56a6a8bff 100644 --- a/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch @@ -21,7 +21,7 @@ index d29a77f..267acf9 100644 - mlog.warning('Unknown CPU family {!r}, please report this at ' - 'https://github.com/mesonbuild/meson/issues/new with the' - 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) -+ raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) ++ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) return trial @@ -30,7 +30,7 @@ index d29a77f..267acf9 100644 if entry == 'cpu_family' and res not in known_cpu_families: - mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value) -+ raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) ++ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value) if self.ok_type(res): self.config[s][entry] = res diff --git a/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch b/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch deleted file mode 100644 index 5295335730e..00000000000 --- a/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 31df0a854aa40c4ce8fbf1ca02ccc9b6bff0abfd Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 6 Jul 2018 15:51:15 +0100 -Subject: [PATCH] Send user to our wiki instead of Meson bug system - -If a CPU family isn't recognised the first step should be to verify the -mapping. Send the user to a wiki page explaining what to do, instead of -directly to the Meson bug tracker. - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Ross Burton - ---- - mesonbuild/environment.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 267acf9..19a3c1e 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -239,7 +239,7 @@ def detect_cpu_family(compilers): - return 'x86_64' - - if trial not in known_cpu_families: -- raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) -+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) - - return trial - -@@ -1012,7 +1012,7 @@ class CrossBuildInfo: - raise EnvironmentException('Malformed value in cross file variable %s.' % entry) - - if entry == 'cpu_family' and res not in known_cpu_families: -- raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) -+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value) - - if self.ok_type(res): - self.config[s][entry] = res From patchwork Tue Sep 25 13:43:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 147430 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp748120lji; Tue, 25 Sep 2018 06:44:21 -0700 (PDT) X-Google-Smtp-Source: ACcGV63xAI9lYe30kgWWRsVckLjUJaJhvDIloIQ4UTgMR/fnhYeMPjTrAsbJKvgZv0hhsEdRKEWp X-Received: by 2002:a63:6203:: with SMTP id w3-v6mr1183565pgb.53.1537883060906; Tue, 25 Sep 2018 06:44:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537883060; cv=none; d=google.com; s=arc-20160816; b=faEaoz5hyltl0DAEYhuYabFaaaii1I1vlni3YhrgmmiePTEnwMfsSAIyzLoa/TYROH 0G7xmYOswAHLDjYYpNWV0BQ8y/7wdMzi0yWwX+ri99hfSclAL7wpcwgVA6mfuFsaiBq1 Qh2d4NJz08t+CuznawxEQQiy8hEpB+CnovW0rx4Yj8IDwHH5jlIt4kVc90UETT0mREFG Os5mSvcdkFhX1uD94V9YavozPM2RhUUYeXQeUpeDa1rOpKlTWEJ4FK7UtLaXb011kPpx 5k88tueHiFfrHfRwxn/qk+ZkGokf5UegeOIJXVLJc8hAeyFtga/Ws9QsMNGh5vzu9F9Z rEzQ== 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; bh=T70YgG6iNj1d/J4Ai7tYgjuw7hr5Kn/O9vaUxGnKaws=; b=rFNk90DJZA3Y6C72NvVU6hRRLux4WIKXeibr6BeX6DFocYGgVJ12nale0BzxSJBGrI 45v/LFdvOQe77WrJ2YDO5hb2fM/AF2s7Om5Oga93avn0aTBE9A96RHIFZArnruzoKQNt 5PJY4lx/IdqD2f1w1sVUrZhfd0XT3uuQnPK3i9Mx7cRv8xZoU9x/bqHc9qLRxeED6GKr bZjSQ+8nIhXO11QHupGGbSA3ZOv0OpoeP78i5oVNTuMiwv8Y9PTZfyyQmxAjbVNXH5M3 JrIwB2B5IHvqhzVTK3c53agg39yhiSMIMR6rNqdatcYL8aKXl/JiCsAdTA2VnPExUHS7 hnRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uQMR+WJR; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q23-v6si2119309pfh.353.2018.09.25.06.44.20; Tue, 25 Sep 2018 06:44:20 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uQMR+WJR; 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=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3A70B794F5; Tue, 25 Sep 2018 13:44:15 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id 5DFE6793F3 for ; Tue, 25 Sep 2018 13:43:55 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z3-v6so11597656wrr.13 for ; Tue, 25 Sep 2018 06:43:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=HhvBxcGua8YhMBOocBbKZcQfPn1NXl6QMZFnxLSxJcQ=; b=uQMR+WJR9q6CHXCuTzAt54kB64yuJH0QG7hhzsbyDBrU5IH24cbdnsNiD6E7JyEM/9 xaMZYeHgDKF3fSDx7cQWYN8POKDcHyTFU9kSBmgzCBC2OA3aVfw04gno1kimLR+u3XAy iqeItTxkhWPX3XcoixUyqj+H3H1QXbj4vG/dUBVJRk9S/HUIk5XwRCWRLPeTe/ix/4/L oI6TAbdz+53SV1/xEF6yqnno9W5bFPokzwdBeL02uD7p/F9C5SzNDnv+sD9GB1bxlZPl kp2ycqruBAyO37mmrmHiX4PJh0wO22tW386BA2GU1tfWyugW4IbcMjVoFw/H3js79pqB YGrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=HhvBxcGua8YhMBOocBbKZcQfPn1NXl6QMZFnxLSxJcQ=; b=VxuZ4ziFzqJ5ACbvpAN4oB1k9qpJNEjh9kmgoxlG3dt+VUi7nHnmE/nOlTdVeIu4v6 wDDHUOyN0x4V3R4AMuz2Ues8I3nOQgpdp6g7vFAoe3JMYXo2vEb4Xyq2KJ3qcXZpNG5n o3xfZUPN5T9tKpRr4qvQLUK48PKGoHrbpL9WpdPI7OjPVkMBa63qKGX/ozy7JC12Jdzv VP4JgaMvxDqCW30g9whZIot9B6x1/CzUMBD5av6bm0ausFdY+edaqLzuY/16sFi0B9hJ 4q199iwjc+2qPRWAZnL83L7+RNcmgxF6XZGAJCvDuJb08Nucd5Kp+JjWVO6k9H/fshd8 cR5w== X-Gm-Message-State: ABuFfohg99CbHnBSB/WHGCnkke0b1QfHGzH/IMSBcehMJsD5aius2Dnr VWpRXHtLmiZBeVingL/R0hXG7jC36Uk= X-Received: by 2002:adf:e792:: with SMTP id n18-v6mr1127667wrm.136.1537883035795; Tue, 25 Sep 2018 06:43:55 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b21-v6sm1852340wmj.28.2018.09.25.06.43.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 06:43:55 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Sep 2018 14:43:45 +0100 Message-Id: <20180925134348.5562-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180925134348.5562-1-ross.burton@intel.com> References: <20180925134348.5562-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/6] meson: pass correct endian in the cross file 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 Meson doesn't care for the value of the endian field, but packages may want to use it and Meson master now validates the value. Use siteinfo to obtain the endianism and write the correct value. Signed-off-by: Ross Burton --- meta/classes/meson.bbclass | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index e3b452786d8..07322cf7865 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -1,4 +1,4 @@ -inherit python3native +inherit siteinfo python3native DEPENDS_append = " meson-native ninja-native" @@ -31,10 +31,6 @@ MESON_C_ARGS = "${MESON_TOOLCHAIN_ARGS} ${CFLAGS}" MESON_CPP_ARGS = "${MESON_TOOLCHAIN_ARGS} ${CXXFLAGS}" MESON_LINK_ARGS = "${MESON_TOOLCHAIN_ARGS} ${LDFLAGS}" -# both are required but not used by meson -MESON_HOST_ENDIAN = "bogus-endian" -MESON_TARGET_ENDIAN = "bogus-endian" - EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}" MESON_CROSS_FILE = "" @@ -59,6 +55,16 @@ def meson_cpu_family(var, d): else: return arch +def meson_endian(prefix, d): + arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") + sitedata = siteinfo_data_for_machine(arch, os, d) + if "endian-little" in sitedata: + return "little" + elif "endian-big" in sitedata: + return "big" + else: + bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) + addtask write_config before do_configure do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS CC CXX LD AR NM STRIP READELF" do_write_config() { @@ -86,13 +92,13 @@ gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' system = '${HOST_OS}' cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}' cpu = '${HOST_ARCH}' -endian = '${MESON_HOST_ENDIAN}' +endian = '${@meson_endian('HOST', d)}' [target_machine] system = '${TARGET_OS}' cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}' cpu = '${TARGET_ARCH}' -endian = '${MESON_TARGET_ENDIAN}' +endian = '${@meson_endian('TARGET', d)}' EOF } From patchwork Tue Sep 25 13:43:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 147431 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp748238lji; Tue, 25 Sep 2018 06:44:26 -0700 (PDT) X-Google-Smtp-Source: ACcGV63Dh4f4rkx5Y+Tan8tZnUqVzo/PaJdD/M2fhMuY1g4kBaG1W1YSiBDk+lBRlYiq/c8207mn X-Received: by 2002:a17:902:1681:: with SMTP id h1-v6mr1323651plh.262.1537883066848; Tue, 25 Sep 2018 06:44:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537883066; cv=none; d=google.com; s=arc-20160816; b=MD2idN9AJ1yzLTFYKEwtwC0D9xpPeXspPVcr61sid80uD7kC+OsxfAeM46crKOJXek dPT4v/aQIBzESyGpgx8z9RYkoaEoZht//hWiu/a+TPJ5k2zDsP5n+hbU2nu2npNOi+J1 yMRNTNKZvCQMyUKEaMAHi+pZxtZr5OHpVSap6PtwRw7WuDO01d/N6WCOwg4t0chu0sD+ 5X8b8qDkn4xA6m+ZhOI2nmpAtZdDMkoPafAd5xWYURSNT5wOoenciY9bxksGFP+ofKmz UEJ6aKrZ6Yi4urWYT2vvk5rTrb4InDZPVGN7hqyEFtVQDfBzZ8cr5bnjFBk4fqqkYGkW vrGA== 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; bh=WUflOgEL4m+TkE1X3wZZll+/tB33vT7K/AcPYvkSVMg=; b=MwXqvTeKaVvtraSzYXJpR3FTLjKZw11QDV4w4qFtlCW2HMkYx74D8gaxWOLPgCmK7D jmx8hRpSSjAVNhdINaKLPnZnAq2WidC3BfWfrnJGw2R5m0slyfSelXKlv34eexXCk+q6 ya2xIysQSDcDKc4cC2uiL86GJ+Oryzk6Y0YUXBZEHRjTn7Ugp5tGTJLlV0aU5kT1LWtk M8eKzjFqTBorDE2TbIlvLsNBqneH1eD66btMNSJdSN4meTurOHmduxorYFCHmU2j0nsO 1zip0HkMCW0M67s7W5eNkBNbbBcj6An8jN1JzBaUQIKGT29v5tEyM0T/8Ue3VLRUOwZt 5eCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uFalI6Dn; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b15-v6si2032280plk.356.2018.09.25.06.44.26; Tue, 25 Sep 2018 06:44:26 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uFalI6Dn; 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=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5C99B79513; Tue, 25 Sep 2018 13:44:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mail.openembedded.org (Postfix) with ESMTP id 319BF7949B for ; Tue, 25 Sep 2018 13:43:56 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id j25-v6so12688420wmc.1 for ; Tue, 25 Sep 2018 06:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=3qeLWcjUpFcTs+8KKEieh4t5W4d+smo6gAt5XT+hf1c=; b=uFalI6DnZQX7puMmZ8DTMHoFKHSr0SxKxtqaaE5enZihuzhKzuh6RZv6qtm8xSvh8H p3LXxprrIaJY/2KAtRuS8Yd7nDuskqgSISisKIq8zQfOCFKMEw87BOYhQO96mUPIK/a0 iudA6HA1qGX5uzwzgERR+bXMZ63h4GFxZ3wV6lqU3/wCJz7AXXaoW44324ay7GRW6133 V+iMZx5rM0ls+SEO6Avli/3hZ3rmBe9kJOVoVVuRQ9WB3U+0TCZvwnltU5apKKr+mYQV dlmsbCU98Ch0VfqKo9LlL+u86oD487NdNIRrzDycYxmBeJQGbwByBiPOmKocJ1e1mwce eq7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3qeLWcjUpFcTs+8KKEieh4t5W4d+smo6gAt5XT+hf1c=; b=VEu9lsT4z8UxI2IMXyJt9yNYjuK3Zou1no+rLMEBCDmUmNst1HLnwQUOZ2ZmHw5pZt H0dvL7j1HhOAntssgHft2Oop4d37+0X/yNMluVI2+a78qoW8FFQwbFFMAMjSlWIVR+qM zYHPK+Qtm4rgHSADlKTx50VhM6v8fu9LMWmhpASQzDbNp1o5ALNI4AQjCj0+AqS567OO Mmb46NquITdcyRB4vTTlfISdGsO9HG457tFjX1Fbh3nH+BQuVyQI+XLRlC2I7UO0pVjn J6BWe2tHl/KwGSWmFGy0HSTFaawn7jqOQRY9637B42Ugr3z7mbc5BsWXvIfz+XkM6Y/l vRBg== X-Gm-Message-State: ABuFfoj59cpaNGunxOoFxMNMVAZGv+HcDDs0OMnKyuvZyimjVhlDlcIr EvKWor1wu8pFgm7LzaSwoiav8deQpyQ= X-Received: by 2002:a1c:f516:: with SMTP id t22-v6mr755747wmh.103.1537883037375; Tue, 25 Sep 2018 06:43:57 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b21-v6sm1852340wmj.28.2018.09.25.06.43.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 06:43:56 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Sep 2018 14:43:46 +0100 Message-Id: <20180925134348.5562-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180925134348.5562-1-ross.burton@intel.com> References: <20180925134348.5562-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 4/6] meson: stop Meson using target CFLAGS in native builds 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 With the goal of autoconf-compatibility Meson respects $CFLAGS et al in builds. In cross-compiled build the cross file is the one true source of flags and the environment isn't used, but in a native build the environment will still be respected. As this can lead to target flags being used in the build for native binaries (including a single native binary inside a target recipe), export CFLAGS=${BUILD_CFLAGS) et al. Signed-off-by: Ross Burton --- meta/classes/meson.bbclass | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 07322cf7865..ed08a4058cb 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -24,7 +24,11 @@ MESONOPTS = " --prefix ${prefix} \ --infodir ${@noprefix('infodir', d)} \ --sysconfdir ${sysconfdir} \ --localstatedir ${localstatedir} \ - --sharedstatedir ${sharedstatedir}" + --sharedstatedir ${sharedstatedir} \ + -Dc_args='${BUILD_CPPFLAGS} ${BUILD_CFLAGS}' \ + -Dc_link_args='${BUILD_LDFLAGS}' \ + -Dcpp_args='${BUILD_CPPFLAGS} ${BUILD_CXXFLAGS}' \ + -Dcpp_link_args='${BUILD_LDFLAGS}'" MESON_TOOLCHAIN_ARGS = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" MESON_C_ARGS = "${MESON_TOOLCHAIN_ARGS} ${CFLAGS}" @@ -114,14 +118,15 @@ meson_do_configure() { override_native_tools() { # Set these so that meson uses the native tools for its build sanity tests, # which require executables to be runnable. The cross file will still - # override these for the target build. Note that we do *not* set CFLAGS, - # LDFLAGS, etc. as they will be slurped in by meson and applied to the - # target build, causing errors. + # override these for the target build. export CC="${BUILD_CC}" export CXX="${BUILD_CXX}" export LD="${BUILD_LD}" export AR="${BUILD_AR}" - + # These contain *target* flags but will be used as *native* flags. The + # correct native flags will be passed via -Dc_args and so on, unset them so + # they don't interfere with tools invoked by Meson (such as g-ir-scanner) + unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS } meson_do_configure_prepend_class-target() { From patchwork Tue Sep 25 13:43:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 147432 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp748350lji; Tue, 25 Sep 2018 06:44:32 -0700 (PDT) X-Google-Smtp-Source: ACcGV62xqau9Ib7lUAcUErNen10CtW1P3lxTuRgJbu67gGRaA19X1WgpIeqz+Nr4Ww6AcorsK07Z X-Received: by 2002:a63:2acc:: with SMTP id q195-v6mr1151927pgq.291.1537883072589; Tue, 25 Sep 2018 06:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537883072; cv=none; d=google.com; s=arc-20160816; b=S8OF0k6aBBxd/UZUbMHCTE4JzZnwn4ZlzAG2EkJxB+e8cq3UPDeCanZ12lOslqhAmL hX/GMC7T8VlG0URcQTT3Yej90Cnfipkg/9nNW4pUqC3c7tUADEUu6RPR3lksM5Klam8N y7yyEykMXm5+e/V2aH0Yjc83OXuJHIbrOg+QS4BWm96KDCmVPCLIkW16FR+/Y+y6PmAy khfofKBI1xGt9YCfTorRP+H/+eXnxMymhSoKx3bUMPcjc84sTjbnFd//BbqtkLSzBCCR CRmsjcG6Qbx6FSMlT66KOdmTPGWsiqOk5blZe9Y0A1PzBrgdhKr10ZM8bslpX5AuaYag LQHQ== 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; bh=nksVYBxUTU6NYVp/ng7732EoXZEBwDhCvO/XVmTOekc=; b=0yqi3Y/qZHD5OWJBhef5xmzoK4GA0tjv340RxsaC24mp8DQ8zPXYBV6khUkJ23uidR eEkPNDelFtGarnDgWnJ6rVs+of7xmlSjuSGTIvqHfDfKFXaBoWmNpCUXPp07PyWLf4MB dWbpx/EM2PoaLa0zN0dMI8fBYEpGFG9gbfnjjwBXiSvKFWPK37wqvMRZklelq5CNllPN Z0EV62NZHZdwiMmYJ34pvL4ONH0RZfKHCMc1yoKdqiC3mv+dVsWzG5GN9iGXZeYsrD9x /hjUZghWH2UcNpiqRdQo7cLezrIWvOpq0rgcxQ+UTFmigewnVn2Z3aH8DlgHb0DFRkWp 73uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=f4phK5v6; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 96-v6si2281229pld.398.2018.09.25.06.44.32; Tue, 25 Sep 2018 06:44:32 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=f4phK5v6; 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=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 882A379520; Tue, 25 Sep 2018 13:44:17 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mail.openembedded.org (Postfix) with ESMTP id D03F7793B8 for ; Tue, 25 Sep 2018 13:43:58 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id f10-v6so2408722wrs.0 for ; Tue, 25 Sep 2018 06:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=ukyVJx+JfZFQpZbMc5uOckpJVBQgoz3zMvA2CPNWhPw=; b=f4phK5v6afgl884Z/v7d+nAhTOU32OjcF+dhHKwUpkVAlwy/u1JMXF1U8wan3LLJER MN3mXNuhZuzDn0qsXDCdQuesctZ+HJSdqVBMXzxvQWQcaEWkQUXE+oWyHbZT37IgFLh2 d+MWVVjzNM1v6fyRo8oqnAZeMH8LNwK0yfgBu5lBKqDqv2x9o2Fph+L7P2aPkSIrssbZ kzgmqa7QjWk2WzaxSwmmdhdTejGKil1DpMxMbE8kxb46t9qLpLij5Vbr+a2WUx/dMVHF WVLpTKkXVJQVVX+YCYJ9u2bFrURiZ0C+EXDPVUG9sJpS/BL089VbUDHYQFXYZ3JZKepM Y/HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ukyVJx+JfZFQpZbMc5uOckpJVBQgoz3zMvA2CPNWhPw=; b=Y2A3TXFssuisJEWbv86blnT1fsp7+vARpZC9ctiQFYUsxwtLj/7eFQRtxBbCFaW2fw CyXDd8E8/32odPREgWsRH7H1Vb2x5Hox+ax/zLR1DHpKRDvaZTzrwD61iR3n5XlrVxXx WW3RX3QcEMp3KN0roOXkXKlv/6wfT2iy8SI3rNig/rVvfpD395sGQi8P9IaxY5/twBQX 6mL6szfXp74elZ04T2WUVPCMw1ai/tY/zsqOHshkh3udamFyGYAGu/6EWsI7CULypqQs f6ZZ3g/1thjD2MYUdGLMO+h4VGB78blDoXI9l5rr9K79M7NFbItDDyx3KUr8jDQrULuK ERwQ== X-Gm-Message-State: ABuFfoj+rn5XntNv0uBkN5xSL5LIZw77IuROmh/ZpJpK9vHwypkjobJb 9SdjmDAqqYtnVpPSb3vFbblWErBe6sk= X-Received: by 2002:adf:a10c:: with SMTP id o12-v6mr1073118wro.169.1537883038931; Tue, 25 Sep 2018 06:43:58 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b21-v6sm1852340wmj.28.2018.09.25.06.43.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 06:43:58 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Sep 2018 14:43:47 +0100 Message-Id: <20180925134348.5562-5-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180925134348.5562-1-ross.burton@intel.com> References: <20180925134348.5562-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 5/6] meson: respect target/native flag distinction in G-I and gtk-doc 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 Remove the previous attempt at this from 0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch as it wasn't quite right, and the rest of the patch is adding the currently not upstreamable runner option. Add two new patches to fix both gobject-introspection and gtk-doc using native flags for target compiles. Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/meson.inc | 2 + ...ix-issues-that-arise-when-cross-compiling.patch | 26 ------------- meta/recipes-devtools/meson/meson/gi-flags.patch | 21 +++++++++++ .../meson/meson/gtkdoc-flags.patch | 44 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 meta/recipes-devtools/meson/meson/gi-flags.patch create mode 100644 meta/recipes-devtools/meson/meson/gtkdoc-flags.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index cfb831b106f..205d2a4abd7 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -11,6 +11,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0003-native_bindir.patch \ file://0002-Make-CPU-family-warnings-fatal.patch \ file://0001-Support-building-allarch-recipes-again.patch \ + file://gi-flags.patch \ + file://gtkdoc-flags.patch \ " SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e" diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch index 57cb678f2c8..7ffd6c54cb0 100644 --- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch @@ -35,32 +35,6 @@ index cb69641..727eb6a 100644 args += self._unpack_args('--htmlargs=', 'html_args', kwargs) args += self._unpack_args('--scanargs=', 'scan_args', kwargs) args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs) -@@ -854,14 +858,22 @@ This will become a hard error in the future.''') - ldflags.update(internal_ldflags) - ldflags.update(state.environment.coredata.get_external_link_args('c')) - ldflags.update(external_ldflags) -+ -+ cross_c_args = " ".join(state.environment.cross_info.config["properties"].get('c_args', "")) -+ cross_link_args = " ".join(state.environment.cross_info.config["properties"].get('c_link_args', "")) -+ - if cflags: -- args += ['--cflags=%s' % ' '.join(cflags)] -+ args += ['--cflags=%s %s' % (cross_c_args,' '.join(cflags))] - if ldflags: -- args += ['--ldflags=%s' % ' '.join(ldflags)] -+ args += ['--ldflags=%s %s' % (cross_link_args, ' '.join(ldflags))] - compiler = state.environment.coredata.compilers.get('c') -- if compiler: -+ cross_compiler = state.environment.coredata.cross_compilers.get('c') -+ if compiler and not state.environment.is_cross_build(): - args += ['--cc=%s' % ' '.join(compiler.get_exelist())] - args += ['--ld=%s' % ' '.join(compiler.get_linker_exelist())] -+ elif cross_compiler and state.environment.is_cross_build(): -+ args += ['--cc=%s' % ' '.join(cross_compiler.get_exelist())] -+ args += ['--ld=%s' % ' '.join(cross_compiler.get_linker_exelist())] - - return args - diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 948dc5a..9c5bd19 100644 --- a/mesonbuild/scripts/gtkdochelper.py diff --git a/meta/recipes-devtools/meson/meson/gi-flags.patch b/meta/recipes-devtools/meson/meson/gi-flags.patch new file mode 100644 index 00000000000..b437ce37cf7 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/gi-flags.patch @@ -0,0 +1,21 @@ +Pass the correct cflags/ldflags to the gobject-introspection tools. + +Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/4261] +Signed-off-by: Ross Burton + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index cb69641e..bb4449a0 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -579,7 +579,10 @@ class GnomeModule(ExtensionModule): + external_ldflags += list(dep_external_ldflags) + scan_command += ['--cflags-begin'] + scan_command += cflags +- scan_command += state.environment.coredata.get_external_args(lang) ++ if state.environment.is_cross_build(): ++ scan_command += state.environment.cross_info.config["properties"].get(lang + '_args', "") ++ else: ++ scan_command += state.environment.coredata.get_external_args(lang) + scan_command += ['--cflags-end'] + # need to put our output directory first as we need to use the + # generated libraries instead of any possibly installed system/prefix diff --git a/meta/recipes-devtools/meson/meson/gtkdoc-flags.patch b/meta/recipes-devtools/meson/meson/gtkdoc-flags.patch new file mode 100644 index 00000000000..ecf3489bbe5 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/gtkdoc-flags.patch @@ -0,0 +1,44 @@ +Ensure that in a cross compile only the target flags are passed to gtk-doc, and +not the native flags. + +Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/4261] +Signed-off-by: Ross Burton + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 4af33304..8751f53c 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -851,17 +851,30 @@ This will become a hard error in the future.''') + if not isinstance(incd.held_object, (str, build.IncludeDirs)): + raise MesonException( + 'Gir include dirs should be include_directories().') ++ + cflags.update(get_include_args(inc_dirs)) +- cflags.update(state.environment.coredata.get_external_args('c')) ++ if state.environment.is_cross_build(): ++ cflags.update(state.environment.cross_info.config["properties"].get('c_args', "")) ++ else: ++ cflags.update(state.environment.coredata.get_external_args('c')) ++ + ldflags = OrderedSet() + ldflags.update(internal_ldflags) +- ldflags.update(state.environment.coredata.get_external_link_args('c')) ++ if state.environment.is_cross_build(): ++ ldflags.update(state.environment.cross_info.config["properties"].get('c_link_args', "")) ++ else: ++ ldflags.update(state.environment.coredata.get_external_link_args('c')) + ldflags.update(external_ldflags) ++ + if cflags: + args += ['--cflags=%s' % ' '.join(cflags)] + if ldflags: + args += ['--ldflags=%s' % ' '.join(ldflags)] +- compiler = state.environment.coredata.compilers.get('c') ++ ++ if state.environment.is_cross_build(): ++ compiler = state.environment.coredata.cross_compilers.get('c') ++ else: ++ compiler = state.environment.coredata.compilers.get('c') + if compiler: + args += ['--cc=%s' % ' '.join(compiler.get_exelist())] + args += ['--ld=%s' % ' '.join(compiler.get_linker_exelist())] From patchwork Tue Sep 25 13:43:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 147433 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp748432lji; Tue, 25 Sep 2018 06:44:38 -0700 (PDT) X-Google-Smtp-Source: ACcGV60Kw8VzQZAzr+iV8mS9vtvnYzXP30U+Tf49IvmxXILeiGI3LnKPLFfgSlF3Exbe7rnqSzva X-Received: by 2002:a63:4716:: with SMTP id u22-v6mr1146495pga.95.1537883078616; Tue, 25 Sep 2018 06:44:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537883078; cv=none; d=google.com; s=arc-20160816; b=kG3AVvWhzlcTpYRb4jQd4ytNzp62Pu4gq2Udrscrr3JdpA290jt7Yf/fkSOeSd5/Mn pxSMX3rkbZewcTNMnzE4KTj6zYHAm3Q/3/bQuye4h3f95hc5wcMDkSl4rTQyp99G9S+n YzRuYHfU4KUp/Voj4ty9YBZdxyK9/aRDDie2eJUMufwKjTE49BhKxhBI1lgsqBrp2cNS ceHZ1HfL3w87a7D/RLtnSzjTGwU7CY47SBmJRQkkjbGibm9zmZ4P5haKVAttVAVyLKYG vQmMqFFMhf9nLVkNPYmPbzgCk2GTbrFVK9Wtlmheb2vdXrTa/WwIRedS6c/Cw77rc+Zb PN3g== 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; bh=YT3hQtbt8yh9VsnPbklPTLUwl8APMsRihQx0Uyo/VVw=; b=qCZb34R7ZcyEwMoW5toiTwwNXd28lVF7mDZ9/JFT0hOPumrXr5QYAP450aNRJWyC/x 0KEZDO9NOgnHxwg6QlbG+PqXD1ud39vBftDUxas1xm2t1KEh4fN22bvC1kaOcIMT5UYP IkCLNLgDj6DVv9iwBC4SwyLITgnHJM3MOmlDDTCm58eTajcSWRWM1ia1nc9HugGmYkJ4 VQqdzV+sQTDOzBcPzjcmwkrMeP90DZ8tkS09rb4ZVjDTaM1IJ1kd4VwZtbCeLILxs3xD jerNKfvnRIiMPBtVo/xHVWwEHzj+n5TF0UVN4o6LaH8xYvF0DK4QtzYlQhOkR8ZtQ3dT jJ6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=w7uNQ6fw; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p20-v6si805791pgm.192.2018.09.25.06.44.38; Tue, 25 Sep 2018 06:44:38 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=w7uNQ6fw; 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=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B1DA57953F; Tue, 25 Sep 2018 13:44:18 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mail.openembedded.org (Postfix) with ESMTP id CC74179368 for ; Tue, 25 Sep 2018 13:43:59 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id m16so6951013wrx.12 for ; Tue, 25 Sep 2018 06:44:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=z6cdj3Cl5aZG1SICXpLgK4pWSgvfrLADceILLXszT/M=; b=w7uNQ6fw7DQ2smR9Y/No7bMAEjhuVzu0vbQEvESWcKnQcosFNyrKV6w5hEq33sZBIA dVElm2GXmIoqwdOwuQIHRop+F8pI6bYDFL3BPK1VpV+PgLUl6LIN7NHb/oTTfFp2zMJH q9GlIeZZlymTihAOfwt/NGpEkpvNAouGJtIFp1tqpNQYxlQG5VEh2EaaGQia+Yt130gk y3EtjSF2VJ8ei/JLOlmODs4kJPlZmRG4U5KMiHyg5ciJJ1Jtubzh+q7zMEd91bDcymOj ftayUF9Wa+G8+2AqhVaRIHu4kC7nKZWhQXH28OcKd99qadCttPPN4Z6q5LrjN5crB18l pLCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=z6cdj3Cl5aZG1SICXpLgK4pWSgvfrLADceILLXszT/M=; b=dQ+DHzP5TDPn1meMpozJcYUFu8vO7hXaJhSw5ljZIzkLekCc6hnRZ+BC6ykO5NOyqv J2E7WK3vR/tTFF9W+AV4J2oF3Kd5PTqcz4yFvKNdhOMzPY+y9hK8GgYa0C11/vsKqefd /xVY20Y+So6nWl7vF620JPPhYpIrbpQ1sNakKxInOUbE4AI9rSkg4fJl94yiBIihiRms GrDybbWkKvbbBi658zfSTHzXXjwqP+Jgdox7K7Uhwvb8aQ66Ue3AwRSTOm5CnXHpToZo JA4Skjof9dTj5rHCCfNvpG5IMslhm498V3GHtONIkiwusYp0kLxdbAbl6B8W0Ov32HhN cO9Q== X-Gm-Message-State: ABuFfohDT82H/VIdH1n5w3eX4UAW2yScHSLIcuYFtwQgDSnMeb8QFQfl N6+RQgKEpeJ6UGVe6s6PRyRF9sMyfBo= X-Received: by 2002:adf:93a5:: with SMTP id 34-v6mr1084310wrp.244.1537883040158; Tue, 25 Sep 2018 06:44:00 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b21-v6sm1852340wmj.28.2018.09.25.06.43.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 06:43:59 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 25 Sep 2018 14:43:48 +0100 Message-Id: <20180925134348.5562-6-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180925134348.5562-1-ross.burton@intel.com> References: <20180925134348.5562-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 6/6] meson: make native-specific patches native-specific 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 These two patches are only relevant for builds inside OpenEmbedded, so make them native-specific. Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/meson.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index 205d2a4abd7..b7fb3e698a1 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -9,14 +9,16 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch \ file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ file://0003-native_bindir.patch \ - file://0002-Make-CPU-family-warnings-fatal.patch \ - file://0001-Support-building-allarch-recipes-again.patch \ file://gi-flags.patch \ file://gtkdoc-flags.patch \ " SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e" +SRC_URI_append_class-native = "file://0002-Make-CPU-family-warnings-fatal.patch \ + file://0001-Support-building-allarch-recipes-again.patch \ + " + UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" inherit setuptools3