All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ross Burton <ross.burton@intel.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][PATCH 2/8] Revert "meson: fix build/host confusion for bbclass"
Date: Mon, 26 Jun 2017 16:11:11 +0100	[thread overview]
Message-ID: <20170626151117.6221-2-ross.burton@intel.com> (raw)
In-Reply-To: <20170626151117.6221-1-ross.burton@intel.com>

This patch was incorrect: meson and autotools (thus OE) don't have conflicting
terminology, and using HOST_* for the host_machine variables is correct.

This reverts commit 77eae90ef5ca3f9a4bdf5727a29713dd2b215165.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-oe/classes/meson.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/classes/meson.bbclass b/meta-oe/classes/meson.bbclass
index cc9bc505b..72f96c541 100644
--- a/meta-oe/classes/meson.bbclass
+++ b/meta-oe/classes/meson.bbclass
@@ -67,9 +67,9 @@ cpp_args = [${@meson_array('MESON_C_ARGS', d)}]
 cpp_link_args = [${@meson_array('MESON_LINK_ARGS', d)}]
 
 [host_machine]
-system = '${BUILD_OS}'
-cpu_family = '${BUILD_ARCH}'
-cpu = '${BUILD_ARCH}'
+system = '${HOST_OS}'
+cpu_family = '${HOST_ARCH}'
+cpu = '${HOST_ARCH}'
 endian = '${MESON_HOST_ENDIAN}'
 
 [target_machine]
-- 
2.11.0



  reply	other threads:[~2017-06-26 15:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-26 15:11 [meta-oe][PATCH 1/8] meson: revert changes which shouldn't have been submitted Ross Burton
2017-06-26 15:11 ` Ross Burton [this message]
2017-06-26 15:11 ` [meta-oe][PATCH 3/8] meson: don't pass localedir Ross Burton
2017-06-26 15:11 ` [meta-oe][PATCH 4/8] meson: set RDEPENDS globally instead of just for target Ross Burton
2017-06-26 15:11 ` [meta-oe][PATCH 5/8] meson: export PKG_CONFIG to use pkg-config-native for native builds Ross Burton
2017-06-26 15:11 ` [meta-oe][PATCH 6/8] meson: remove redundant patch Ross Burton
2017-06-26 15:11 ` [meta-oe][PATCH 7/8] meson: use tarball instead of git checkout Ross Burton
2017-06-26 15:26   ` Martin Jansa
2017-06-28  9:21     ` Burton, Ross
2017-06-26 15:11 ` [meta-oe][PATCH 8/8] meson: set native tool flag variables Ross Burton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170626151117.6221-2-ross.burton@intel.com \
    --to=ross.burton@intel.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.