From patchwork Sun Sep 11 21:19:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 668526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sXP2l5DMbz9sBR for ; Mon, 12 Sep 2016 07:19:27 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=z2OZO+CQ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 946328693C; Sun, 11 Sep 2016 21:19:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FIcddvp2i3yv; Sun, 11 Sep 2016 21:19:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id AB310861F7; Sun, 11 Sep 2016 21:19:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 36B2C1CF817 for ; Sun, 11 Sep 2016 21:19:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1D1CA234A0 for ; Sun, 11 Sep 2016 21:19:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gfiAkzuZV2gC for ; Sun, 11 Sep 2016 21:19:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by silver.osuosl.org (Postfix) with ESMTPS id 17BF623334 for ; Sun, 11 Sep 2016 21:19:20 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id 128so7070452pfb.0 for ; Sun, 11 Sep 2016 14:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=p+VSW2zyk6y8dJth+VwIj0NR9xSxH4jkRgO1kSNOR7E=; b=z2OZO+CQE1VywpNKm0vGzCaID4jRa2Tm4XhLHkHewT7uewgw1VaEYK8b9TPQIfQvqM mCPGwIHRwPQkSkOiWojcCu+l6JMj39NTFWC7SOeQrEuOLYeW0XsOQgdBWZp9BWnuy0qj XUKiG9YI5vl+gEj5p2GGzUiqarwB+73HMaS75/fRCztmKZt+hWn5tOnuSIdjukyubVit 7AiwK6O2kciJC0p8QpK6hJK8SjI0ZySQZhGQLjDF/u8MeWSxKwzRku/Ak6xcadrbvaxc AEufr99iT6FyM5uJuLwk8098lgPzd6uT823SDVLf9wSYMpwc6aj5r+PeYoOy6fHXfSz0 SMPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p+VSW2zyk6y8dJth+VwIj0NR9xSxH4jkRgO1kSNOR7E=; b=mRNUxfhQxQciN/g1yCdc38Gz50YHy8qxqjcg8C8P5uJ+UiGyuQldQtUOI0xYqwdZdM P1Rhm3jrRrolR8Q8JDUMQcdClZ8eBxVR/vms/SlXGWNljAIzEUGAuiOZ+33DeUg1efMP JLCb/fEoqViV/iqRlyu/cUb2rwP6hQb4DR+oewI3x5AVndOOFcxNcFDAHCWra34RqAOb kajBbIu+/NiQPJOLgqlj/jMxaUeBeFKhn/TfDe39CTzC9HkwOA/Itv1XT7DFjNeGkCx2 qYdpVZyXFzws3CpyL6mmUL1SMNbiqTNiAIaoOAVj08IdIt2iYilYw+5rxSJ5BMv2HWWa WroA== X-Gm-Message-State: AE9vXwPtZ8QnM2ayBL2lpaqG16ZjFQkhrkcpCEfWfc1zC9ENYSTgtLHwrxjymgAKBIBJBw== X-Received: by 10.98.86.154 with SMTP id h26mr27452251pfj.22.1473628759623; Sun, 11 Sep 2016 14:19:19 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc (2-163-36-202-static.alliedtelesis.co.nz. [202.36.163.2]) by smtp.gmail.com with ESMTPSA id wr8sm19389832pab.44.2016.09.11.14.19.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Sep 2016 14:19:13 -0700 (PDT) From: Chris Packham To: buildroot@buildroot.org Date: Mon, 12 Sep 2016 09:19:03 +1200 Message-Id: <20160911211903.21933-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.9.2.518.ged577c6.dirty Subject: [Buildroot] [PATCH] micropython: add upstream patch to fix build failures X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This allows micropython to build with a host python version of 2.6. Fixes: http://autobuild.buildroot.net/results/212cee82cc9db81cf1524925d106e01fc1e62ce5 http://autobuild.buildroot.net/results/4f72a602702f4eac1fe8c4a385ebfeb6e1c50df2 Signed-off-by: Chris Packham --- I wasn't sure whether to use MICROPYTHON_PATCH += or the line continuation that I ended up using. I couldn't find an example of either case. Murphy's law dictates that I've probably chosen wrong so I'd be happy to resubmit with the other style. package/micropython/micropython.hash | 1 + package/micropython/micropython.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index a8ad2ba..28c008d 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,4 @@ #locally computed sha256 871378fcf1f1042c399896d5673da67d12e1fb36c2e706af289fc959bc8f7a57 micropython-v1.8.3.tar.gz sha256 ff3194ebecda99023d7c1bb94d32b31b9491e95a79958a25ffd05213c5553acc 8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch +sha256 ac19af8587211d7229074fefa1a3a3c0fe807babc7cf9ce53606f05958699448 a50b26e4b00ed094aa1ac74eac2fc2d8eb9ea1ed.patch diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 590956e..2f47ad8 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -9,7 +9,8 @@ MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE MICROPYTHON_DEPENDENCIES = host-pkgconf libffi -MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch +MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch \ + https://github.com/micropython/micropython/commit/a50b26e4b00ed094aa1ac74eac2fc2d8eb9ea1ed.patch # Use fallback implementation for exception handling on architectures that don't # have explicit support.