From patchwork Mon Jan 7 16:38:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 154914 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3674701ljp; Mon, 7 Jan 2019 08:39:12 -0800 (PST) X-Google-Smtp-Source: ALg8bN69E2WA5edjRkgYv3NcZH17tLTGlfil245wYrvZcg2xROWyIjsspL/wFmhtgvJs70h4CEou X-Received: by 2002:a65:520a:: with SMTP id o10mr11866926pgp.276.1546879151895; Mon, 07 Jan 2019 08:39:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546879151; cv=none; d=google.com; s=arc-20160816; b=gEGYTXPEpXUbw3BpCb91cE98v/iPjjHd44zCNHOKgCzKD+x6QTclFL2Q49kqAaPZaK wgnQ3HUsZqKEe7XgU27wU0p5z15bp+2+qLdSdqOt0fL32r/p2GAufHtQjDTzAaWdvKTJ 9EpwPXG5mhZKP0hbVrBKnZIr/wqbshdlFiPSuKYqD6soM8yrdM8rQEFJau2sXR1eS7bf jby9+fyHFlbLj5HleY1ZN5r8zW9gVgYRDZZ5iCWDsxP2Yjr30t2jP4RgzzkrYUXSsjbi 1Twqtt/ASqewXu6OSQVrCVt61RrjYutY2WXXP0V4JtIMvQJWmhf8pPU8B5Z1wEDIosxc 9mtg== 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=Qe1LLsR4oQZ3I1CIsQAzWwd9SOWGN53zMQ6PA+O4Vkg=; b=W0WjM6FMXttf6kEKHno8vopsvs6ZqKsVhWS3onaYKD6KSJmAx8bB2ZbHgS93TugCsN jvSi/F22PyScCu+m60pvXJfRyGVn6X+aBDEe5CP4qU3GVzXm2x9nyasuJnRyfU7GzXAa aT7Hcu1XtCADdCQd0WdIJmSeUGkDZNeUp7NdKTUCWjbZkn0S9YQmS/JnEGmAtL4BwGQd GPNLDks0sYsdzvXLoaHR5dbqF+RYjVzO3fZf3q9zFm+G4H/+wCKQQEki9+//hbaYRDHE JE+fDrACps1KbSVNBT5jITlnUYACwxzmkip5yYinXDUhQpe4f64cGPvq5pboMmbVjhWS isfw== 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=IpJfqXxr; 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 g21si18352787plo.435.2019.01.07.08.39.11; Mon, 07 Jan 2019 08:39:11 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=IpJfqXxr; 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 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AA6BA7BF27; Mon, 7 Jan 2019 16:38:59 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mail.openembedded.org (Postfix) with ESMTP id B35727BEF8 for ; Mon, 7 Jan 2019 16:38:36 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id b11so1487439wmj.1 for ; Mon, 07 Jan 2019 08:38:38 -0800 (PST) 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=uXYx5AdEKzygw1as0yCl2jyD5GN+mv7tMAuIFJ5p5jE=; b=IpJfqXxrvtZDZOBD1SRdG4YEbZ8SlJe4XImifJqLfTpPUIkREilYcRUOBeIoNTFZih Ll0ClkLDc4l0enlkurcWjvXgTNfQOA1QV3kbBFWlLb1QLSK++n58lcsiRnoKxPQNEdrA g+G1fliYXK6odue8JLi5Goj5bF1j3vjDGnbZ0aFgKCW1mSYOQi4YoqzoIvO0MdHWTs+X MFD4EbkQ3xyDbh+Kl+qPPF9fmWitwj1pgJWSQr73cHRdAPnQ1/N/ET4WMous3ft6fz7Y XzBG5lTvnZmvsTklh/aheh75/SgLmLz7YlqUiugGrUpxFDM7a4G9E0vd3URxbiNH7Hcp aoxg== 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=uXYx5AdEKzygw1as0yCl2jyD5GN+mv7tMAuIFJ5p5jE=; b=H+YAdSyM5oPv4eJ4XrtFNxprPzTrfQ3jysUQjbLR6WqzMtVf6kyHMBK5Dq/uxDs2NL 6T8SI4YwieR7S+PDqtamBSkXwI2HHQfA0AEoy7rWvLzSCm4OZDYmwshI0iZG5PUGH1c0 4e8X0zYLgrpm1VT8+4gamAv6aF75Cs6ikJEQ+AEWFwAuxT+cdZym5K6Iw2HblI8rQc+S eDMbxK29xBXjmDub9vebrqMjFCUkWr3rxZORlFzLNn0tXxJinOvsuPS609myyb+oWOgG CeyL3jUeJHUAbiZ5Tt+OYZY0dhUt/7TsZpyoEYKsmXs8TDSZt05yMHtKiXXUkSpS/1b5 7dtw== X-Gm-Message-State: AJcUukedy+9y3Ruuf5LxTrhbgbSTkhh1aWtgo6GLtMNjUWuI+zgnpDVe zxseGoT3Lx+GAcgd8oK57kguV0QUt2E= X-Received: by 2002:a1c:7f0c:: with SMTP id a12mr8933845wmd.89.1546879117170; Mon, 07 Jan 2019 08:38:37 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o5sm13918958wmg.25.2019.01.07.08.38.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jan 2019 08:38:36 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 7 Jan 2019 16:38:20 +0000 Message-Id: <20190107163823.31816-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190107163823.31816-1-ross.burton@intel.com> References: <20190107163823.31816-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 4/7] meson: write correct host endian into SDK 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 ignore this but will emit a warning, so write the correct value. Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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/nativesdk-meson_0.49.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb index 55c57775e06..1549357a554 100644 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb @@ -1,13 +1,20 @@ include meson.inc inherit nativesdk +inherit siteinfo SRC_URI += "file://meson-setup.py \ file://meson-wrapper" -# both are required but not used by meson -MESON_SDK_ENDIAN = "bogus-endian" -MESON_TARGET_ENDIAN = "bogus-endian" +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)) MESON_TOOLCHAIN_ARGS = "${BUILDSDK_CC_ARCH}${TOOLCHAIN_OPTIONS}" MESON_C_ARGS = "${MESON_TOOLCHAIN_ARGS} ${BUILDSDK_CFLAGS}" @@ -44,7 +51,7 @@ cpp_link_args = @LDFLAGS system = '${SDK_OS}' cpu_family = '${SDK_ARCH}' cpu = '${SDK_ARCH}' -endian = '${MESON_SDK_ENDIAN}' +endian = '${@meson_endian("SDK", d)}' EOF install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d