From patchwork Tue Jul 31 17:05:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 143201 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5576400ljj; Tue, 31 Jul 2018 10:06:16 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdA1njNH9nLfNm0x+5RRnXVrbu5lwL+DYTs1Sq7JzHVMUG5ifJSahGPZ/fzbfDr9QjSb3+E X-Received: by 2002:a17:902:7147:: with SMTP id u7-v6mr21003950plm.154.1533056776282; Tue, 31 Jul 2018 10:06:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533056776; cv=none; d=google.com; s=arc-20160816; b=aNdBk0ZVM5RMfFzNIDc6AVwA3dnqNbICsFuownq0cpkVXfNk2WT8zRXODyZrSW1Uol u/HVMzZjAytFvnTjVUFWxwxg2LARG/bPmP2k5viorg/jepJR6jyvWtvRNh5oaySDNoAf 8aTU8/0l0WDlt07bYAHOli2xUVxRibL9RuAOpDZh3mGOjCggG7K7xo31ALIiJ1/D0Gzj lOuDj7rbzH5wsKyRmgIG+sIzzuQgozbaCA6nrGok/lbY2P8qy4qlTOovU5bZ8NBXL5sH TCoeWf8tGeInZRlNCfKwPrJNqErTqeSim+W74wmGUVKA51e1Ik4EErhQUCMmW5QkmgsQ S0LA== 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=X+kCJzYf2TWkvnCkTTPmG1NY3sX/azMJRPAUFKMtzoE=; b=S5whSOUDWhv+zfPnTeaWB7rU2nCMlxw0hZtKIYjIt7s4Vt+HzysdhptftgDheZkmo/ NE5Kd8FXKWFgUMJmzmsF4g7RUtGCddMprw9Q5eYKHmKBfdErkt7OHjMNUv4Nm8DJXbzF d+KwAd83Dl4KXv0ATiaYg2mQsU9AxQsRCXPmzzXKiLiPW6BDjD595Hyvf3tGFMk0s9pm XGLbMe61Oe+N9Sh3xnJm9FzOo94SaLi4A3x69oVCcXMRe5nk9g4QDLqMWTrunPT2kNNN I/KbnaVvhBRvmwmS+sG1YAKu1NjpfWnpyl0d0v+K9wY3EC8nJKBvRprkVj/HekymMnMt A+jA== 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=RhvbFIhI; 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 l17-v6si14545877pgn.182.2018.07.31.10.06.16; Tue, 31 Jul 2018 10:06:16 -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=RhvbFIhI; 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 B56B078CCA; Tue, 31 Jul 2018 17:06:13 +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 172D178CC6 for ; Tue, 31 Jul 2018 17:05:44 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id e7-v6so17418949wrs.9 for ; Tue, 31 Jul 2018 10:05:46 -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=LhaTToqYRmbxO3WRdABDSc8TV5N0DH86MNMTd4oFZjU=; b=RhvbFIhIknMCKNfMSFzUBObnnpwohbtkwes1MhptAscMVy9w+pMmJjfFs7qH+aaFqk F49bdrQUqkFMoPINpMXSVqIF7wOh+jh7hHNTHThwMLdYXdCM1PH+mtdGHedllnm72Dl6 Q7zIWtbyl9k1wl5rgMw8DcJEImTgXnorSWmAwTmKwMZJ4rXBuGssFhYFvROEVBlFSnbQ 0LiG2HHRwj8rLT8y+tEw78Q+vv5Si6rhBFODZvMLRy+3yUjBFL4CHAiHlgle8RCxe2Rs EjRaTV/n3UnB1fS0N+XAYGdZqcYnXlWT5SRBqFIg7/Bu1naR4U9nsuiU2afD4xQoOBBd xGUg== 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=LhaTToqYRmbxO3WRdABDSc8TV5N0DH86MNMTd4oFZjU=; b=TyUw5CkGEZxEKVGXkfrdBYnEuqR7GJKtwRUY0Rwr/t4/KLeflm3Ry5itighefgjpvB rUivii1Ix9fUrsHVGErQmxOIhCWFFNP/ysqHVMky6p15cti3iUlt7H2km4SpAl6vlZ02 gBkj88BGn4ae69s3lFLjMkR4VgyNQXYbfp+jQTcyHKDCMD2kMGFAdd7lc/hn0VzlgOEO 0qKKCh4KWEaOPoMW0Ypg4zu22NQxLBCcnCNr5sm4p8X86NpX3VHL8SDb4w/4W9LrVJg2 AJqVIeIjToBPEonbkHLw/SDfUwOa+5rwfZZtn1BGWETnnaof/tMtiInleVp9kE4ynGt8 GKWg== X-Gm-Message-State: AOUpUlEmme32WVjn36n0yeo+o3XCuMinqevdo/4kdJt40ScdUKwj4TxN Bo9WCk8IxfIM/3CETlR9i8vsqvea22Q= X-Received: by 2002:adf:84e5:: with SMTP id 92-v6mr21739055wrg.56.1533056745358; Tue, 31 Jul 2018 10:05:45 -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 b8-v6sm13920419wrw.22.2018.07.31.10.05.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 10:05:44 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 31 Jul 2018 18:05:41 +0100 Message-Id: <20180731170541.13620-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180731170541.13620-1-ross.burton@intel.com> References: <20180731170541.13620-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] python[3]native: allow use of both native Python 2 and 3 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 both classes using ${PYTHON_PN} (which is set by python-dir and python3-dir), hardcode the right values so that it is possible to inherit both pythonnative and python3native at the same time. If both are inherited then both native Pythons are available, but the last to be inherited will be the one to set PYTHON. Signed-off-by: Ross Burton --- meta/classes/python3native.bbclass | 6 +++--- meta/classes/pythonnative.bbclass | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/meta/classes/python3native.bbclass b/meta/classes/python3native.bbclass index 89665efee8b..da12a714703 100644 --- a/meta/classes/python3native.bbclass +++ b/meta/classes/python3native.bbclass @@ -1,8 +1,8 @@ inherit python3-dir -PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}" -EXTRANATIVEPATH += "${PYTHON_PN}-native" -DEPENDS_append = " ${PYTHON_PN}-native " +PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3" +EXTRANATIVEPATH += "python3-native" +DEPENDS_append = " python3-native " # python-config and other scripts are using distutils modules # which we patch to access these variables diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass index 4cc8b2769c2..ae6600cd155 100644 --- a/meta/classes/pythonnative.bbclass +++ b/meta/classes/pythonnative.bbclass @@ -1,11 +1,11 @@ inherit python-dir -PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}" +PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" # PYTHON_EXECUTABLE is used by cmake PYTHON_EXECUTABLE="${PYTHON}" -EXTRANATIVEPATH += "${PYTHON_PN}-native" -DEPENDS_append = " ${PYTHON_PN}-native " +EXTRANATIVEPATH += "python-native" +DEPENDS_append = " python-native " # python-config and other scripts are using distutils modules # which we patch to access these variables