From patchwork Thu Jul 5 15:58:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 141186 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2108628ljj; Thu, 5 Jul 2018 08:58:14 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdJiY9NV4EY+Ckm47+wokgsEfsxkitcgWJsPsyNIPf5NwqSJZtStGaMpjaVOyG0AIcoupvA X-Received: by 2002:a63:9311:: with SMTP id b17-v6mr6158944pge.261.1530806294727; Thu, 05 Jul 2018 08:58:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530806294; cv=none; d=google.com; s=arc-20160816; b=Xb9+HY1RydVNK3RlckSeBuc47QWnCKWezMIh+XkhobG1D+3+UeL5292sLsm6EqGIBF LVdf4BlSM3sueJ1pmEHSPFC1iZIATWWxaZEUGphxwCY1lBrMBKve0gLM2sQ/YaNVs0QK z936M5KFrkkiJDSHkeMpYc/VVlRRl1DnitX5LF83bPxDcNccqLMLFu1f6VgO6kcmgGJN QGrI5Dp9AIryGdtTvtPFMuWYaG2H6V7WFiUQekjWb2BExWlWALjGbeulDkl2H4Z1k1+D GXJeJc31EHeaA3mffiATxpuAfmsPWpUrNO28RDRYUyx71s2PtDXgnYZsjnN3tLzkjEie zECw== 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=zTlMD6zNTOTwYfFwcaRRNKwW7ZPYj4FPeofnVVk65cU=; b=q4DfvFsXSo0IrCUX4elCmciA1cK2z8ZzOEFdyyE9X32CBi6Xugt1le80AMITIZuibb kekP4kDMmgxMNVyjJN1Nhh+hYrFOA+ldmA6cAmACV4txDrzc6pcmhIMYKUFbDX8r+LRZ Ertn89C6yej4hWP7aYZ1UKlGhKoryI+MSzYu1l6PPuT2ZlUSyVhIYxvhfxif9tkylvHo EFr0B6yNEghkNjDaaRD/eh+qCyNStB2BkQ9mf5p67OgqMlEfdzerzENtueCkvoPXdhpv QHxdsPCPuI3u//TfYNmfkMvj7KAic1fj8ED+OG7TI1umXiR9fmuoeuFCHjMzkd4/mvDn Il+g== 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=g59XCoZo; 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 124-v6si5713948pgi.425.2018.07.05.08.58.14; Thu, 05 Jul 2018 08:58:14 -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=g59XCoZo; 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 D59F878A4B; Thu, 5 Jul 2018 15:58:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id C033A6086F for ; Thu, 5 Jul 2018 15:58:08 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id b15-v6so1454724wrv.10 for ; Thu, 05 Jul 2018 08:58:10 -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=ldkAKxEyujIF+sDMV1RlHZvKR1DQ/zIxA/uzbOuKEEM=; b=g59XCoZoIDFExP2gZq05Y8AdwDFh9g+XhkYiRG9W/9uH8GQl+AhLk84V3ISl/QqVqe R1qGwQKAq+7ZvKCJvlkXaI337rYFzHITsVxawvr/Liov7wL0KBl1/eJOXGr+clOGTKDd Y2IscyuT5X/v54NzIG8jgHDbdH/DwR+XCBVLrFEdLeFMPOdamqKU72G2PqJC5o53/L47 MWwfKjflULH1a+Sdiq1FrwS23orqaI7Ekn3xP3cgS8OhmYWELTkOSqtXv8+oh6/GOQp9 h3llrkHLu65bwCk/P6KYcgae/E2gPL9MLvPWYAuJ07kPWAEWgIyx6ZQQnpWeuM4kwb+E sKLg== 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=ldkAKxEyujIF+sDMV1RlHZvKR1DQ/zIxA/uzbOuKEEM=; b=YXVvT1MbTmg59BQScf+KyUS92FKmXAiXid6hH5531kP7T21Us7v4gyo9ife0uLtNnG qT/mdxooaqsM9yyHCReXOjxzFnceiEfNaDfXfx0iLS+5KNno5JBu4Q4izloPGdDb2KTt 8EMnildg8sTLE1o+g/9N8ocMjwMmZJdGwYL1Fao/fXY0viYrhar7jExz8bU3NbGo/kbC f/ZNvUFfazZLjnSzp94+lEeYpm+HYxFtQNitVuBH5G4RsFQI3hryzU+9Beb6T1lUNTUa cbnMGdOnhBGbEf+V38n1tNhcH/n9O35FxGARsvMrhCJtMxlSDy7YjfENz/SVzt7RHlg9 mLDw== X-Gm-Message-State: APt69E2fXLO60fkPiHRvGB50MClpdX/J4eNU+skYBtBZvqF8SlmfeDGF It+CK9gyFxKI0hX0yXqC5XHK1cGM X-Received: by 2002:adf:edca:: with SMTP id v10-v6mr4962625wro.264.1530806289002; Thu, 05 Jul 2018 08:58:09 -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 r194-v6sm12188065wmd.36.2018.07.05.08.58.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 08:58:08 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 5 Jul 2018 16:58:04 +0100 Message-Id: <20180705155805.20847-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] python-numpy: set CLEANBROKEN 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 The distutils class is about to do a clean via "setup.py clean", but numpy doesn't support this and errors. Signed-off-by: Ross Burton --- meta/recipes-devtools/python-numpy/python-numpy.inc | 2 ++ 1 file changed, 2 insertions(+) -- 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/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc index 1d822fa3fe3..1b51f7baaf2 100644 --- a/meta/recipes-devtools/python-numpy/python-numpy.inc +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc @@ -77,6 +77,8 @@ CONFIGFILESURI_riscv64 = " \ S = "${WORKDIR}/numpy-${PV}" +CLEANBROKEN = "1" + # Make the build fail and replace *config.h with proper one # This is a ugly, ugly hack - Koen do_compile_prepend_class-target() { From patchwork Thu Jul 5 15:58:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 141187 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2108839ljj; Thu, 5 Jul 2018 08:58:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfvzmc07xX2n5Ilm+qYYv/m2ouPoB8GHt4jrUpIWpo2Cim7orifmnp9+m2c1UUMhrcbirys X-Received: by 2002:a63:9702:: with SMTP id n2-v6mr6034970pge.88.1530806306569; Thu, 05 Jul 2018 08:58:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530806306; cv=none; d=google.com; s=arc-20160816; b=iisz37i3N/0JcMU4sBeYRnj094AVFhtuSaUdc5B8LsmB77xhCixtm4+CjLFF3ZDEYj N0rR6TdC71lQCpNh2Q34tUYQAb5Ik9d+oQoqhI0IH5naI/LGKchgc4rcxIIVSGoWNUFJ BZgbQ2kR+HrDHGL68c8fv3HwpS9/rYtMCafYVFm9xjfK0U9wChsRFuaqIiyvt+5luazf 3NpPFpAuYuS3sbQHrcdyiwpLMIVv/D9rTBG22d3uxhdCztXFOgROXZl1pZ8LsLZL3uud DVKwusnqOxyjUMQpS6A47vfIVKQr0Kq+l6DeZPDnkMblrG3v7aoOrY8T+S462WvyDBrU sSmA== 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=OZbefoLdwqDoZYo6EnQcgZwb+SJOx0f4ZWRQtyfwOnU=; b=OKK3gAaCX+7dlRgzynaqA978F2qx3y0Tu4bVjeIkKfMyDfJgFlwb3aVLA+zIGr7N9P XTKRGCKeL6EWBhY4YzS6BT2a8nWkGUQIASn+/a0EAJuc1hHLZ5fLHrg++REUjrKJLoog 2xl4DEXZ35yrmxYLBRYyDGPN6LVF8yb8PD1lpN1ExGel6k/9yKEfIULu9k6V8Wi0RzNH WBIgL4KZ6T98BTBtEvir5+aadEgAI3H+rhaW935+v1PLczgh7vny0ATkf46Z7LlZw4sN uecLNx/AgJi7q/UF5XT7la3oLMuxs7aVzE24hdWOHxgd3uSJWLtLjt4+bbHn5ntMoCO4 DeGQ== 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=Z5f3p7tv; 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 h2-v6si6161334plh.339.2018.07.05.08.58.26; Thu, 05 Jul 2018 08:58: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=Z5f3p7tv; 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 76FFE78A51; Thu, 5 Jul 2018 15:58:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by mail.openembedded.org (Postfix) with ESMTP id C88646086F for ; Thu, 5 Jul 2018 15:58:09 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id w16-v6so12046269wmc.2 for ; Thu, 05 Jul 2018 08:58:11 -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=4QmxmfDK/TaZLOScLYmjZxxuJpyqKGCRG8hk889RfeA=; b=Z5f3p7tvky+akalFawXnel/AXrlzjaQLtJJ9QpnYVY0MhUKpSAhk95bsNos0uxTG2q /ABDsDHn9e3txScotYSSKDr9j5+o0+C1i9hOBPC4bTy8HeYROLEcyYBn+v/+sQx8JMmy UoYi3SMy5ww3aL5iGyoeN+3XgV6TBnn/82q9LIItn1c/fdV/yLgp1+NdKLJ0BtcrhqlV 01JbvbE8dr1qyPxv+gzsLmfhYCAA7ROyO5mDW/Uf+52OQneJXkKdvCAn9XYR6PTAKhE6 v7F9RKw6sv6OiYv+zwQPILwq8SAgtsyfuYvxvvAE9p+X2YyFTijZ3gqNdYI16vE3alf0 Kk/w== 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=4QmxmfDK/TaZLOScLYmjZxxuJpyqKGCRG8hk889RfeA=; b=niMfM0XQ6q5xD6shD7kztSmK4iIzVwvprUnyNE/escZlOqOcFQ3hQMn1jlWMaJXsyl /xUtyK+BVvW49icQ24ieMlmikt4XKkYMjerZ3IJqI5KMgVDJxiu9DXdDsKTus64+6o3C k8xPPmvOHDV9VYfbNqJxVFNar8T5n1UgJbU/E4aV68zgc+oxaAbWH/In9ZSNAx3xsx90 kR2D0m8yYmHhImTS0Rh3im1YWvciOjz+OqSoTHytQw9CfcWfu+UNRejrafveB2ysFcV0 FcPhRDPX4oOq3Vr97HhcrlTb7u89AjHTG4jy1TlMyYvfEmjLCPRv+C/HK2reTFumMtH0 SbEA== X-Gm-Message-State: APt69E3sxU2oxH+TTJwpVJF0tLNeHhDa9f1xKmPCU4UVBIys12QxnP6D yncLfrijrAyjMvy+ir277qYJTonV X-Received: by 2002:adf:ab95:: with SMTP id s21-v6mr5396589wrc.90.1530806290064; Thu, 05 Jul 2018 08:58:10 -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 r194-v6sm12188065wmd.36.2018.07.05.08.58.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 08:58:09 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 5 Jul 2018 16:58:05 +0100 Message-Id: <20180705155805.20847-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180705155805.20847-1-ross.burton@intel.com> References: <20180705155805.20847-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] distutils: clean the build tree in do_configure 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 base_do_configure() tries to do "make clean" if there is a Makefile present. For most recipes using distutils there is not a Makefile, but we do know that "setup.py clean" will work so call that instead. Signed-off-by: Ross Burton --- meta/classes/distutils3.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 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/distutils3.bbclass b/meta/classes/distutils3.bbclass index 6c303068820..99ad64d287d 100644 --- a/meta/classes/distutils3.bbclass +++ b/meta/classes/distutils3.bbclass @@ -8,6 +8,12 @@ DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${prefix} \ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ --install-data=${D}/${datadir}" +distutils3_do_configure() { + if [ "${CLEANBROKEN}" != "1" ] ; then + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py clean + fi +} + distutils3_do_compile() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -71,6 +77,6 @@ distutils3_do_install() { } distutils3_do_install[vardepsexclude] = "MACHINE" -EXPORT_FUNCTIONS do_compile do_install +EXPORT_FUNCTIONS do_configure do_compile do_install export LDSHARED="${CCLD} -shared"