From patchwork Mon Sep 5 09:16:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 665671 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sSPHN55yVz9s3s for ; Mon, 5 Sep 2016 19:16:32 +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=M6Xn3kfS; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4A41B872AF; Mon, 5 Sep 2016 09:16:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EnQa4vaREWml; Mon, 5 Sep 2016 09:16:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 71C9C86EC3; Mon, 5 Sep 2016 09:16:30 +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 5F8901CE527 for ; Mon, 5 Sep 2016 09:16:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 56A802F254 for ; Mon, 5 Sep 2016 09:16:28 +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 9SLysKG2GqVJ for ; Mon, 5 Sep 2016 09:16:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by silver.osuosl.org (Postfix) with ESMTPS id 50D172468A for ; Mon, 5 Sep 2016 09:16:26 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id i6so9467504pfe.0 for ; Mon, 05 Sep 2016 02:16:26 -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=Ensyd3a71ddjTMTN6rVIwbEUss1x2sdaVmDkp+IEtRQ=; b=M6Xn3kfSLvmAJcUP8lsobHYc6ZygZnAvsP5XVsPtmzKrBe6/9g89B1kWA33cR0kP8z GMuqPZ8N6WLkyA2wWTiypR64M5AEC5ju66noSchqMGVQ3WJ4/estgvU4ymMJuQgK1fzI ZjrcrtS7cKiJtZH4UmDbnzdcIVO5MKw6h9y57eXau0yJoEMCWB1h/5C8SevHilh0CQQn oRtjezOsKJYTOozqZk93jU6kP5dCkXFED59mknYAdLCkzyaYuCtGQr/ba0f7hwhKRcbv q5pFwblH8Ay1Gs6wqErfIfuepg3c8Li2uYwIYnQHo3zj5qpu1IYrgFW/UoVuVE1rKxr9 Sc6A== 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=Ensyd3a71ddjTMTN6rVIwbEUss1x2sdaVmDkp+IEtRQ=; b=KA20J5Sy/G6cEwTa2swf0Os2hHCM9jAU8KjiOTqPgdVG1y6Q8xSeH21Ew1wF/1UXcN 66hgl0xZsy67IEliQpupclhObXFS2A5RyGnZEfNgrimMsUUdBlhc85whDedOmQhPuN6R k2VcGCJ0PXy+eHnPltziWquFsOl7r00f+bMq+sAMYsXLnalliy4lr+tFtiSAfKy5ZAI7 Dxj2ntX/uEucXvfaxy/2xKeMQqAncctBtu5LnhSpaxzovTV2y9qxhjQqyKnamTNfF1le szfhLi6Kqvz0uunGVZuGiwK/FwPfAetUi/8WBR7RIFxBgxlID6etB4xFpXm1kPOokdoC BiGg== X-Gm-Message-State: AE9vXwMLLMTkgdf52ZHcoVLlSqmxgScFje14turh2REIW5GDP4E6nErzaeohNJ4i28GX+w== X-Received: by 10.98.85.134 with SMTP id j128mr61961511pfb.6.1473066985992; Mon, 05 Sep 2016 02:16:25 -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 uk2sm32121450pab.39.2016.09.05.02.16.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 02:16:25 -0700 (PDT) From: Chris Packham To: buildroot@buildroot.org Date: Mon, 5 Sep 2016 21:16:15 +1200 Message-Id: <20160905091615.9075-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.9.2.518.ged577c6.dirty Subject: [Buildroot] [PATCH] micropython: replace local fix with upstream one 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" The fix from commit 26248571b625 ("micropython: fix build failures") was applied upstream. This replaces the local buildroot fix with the patch that was accepted upstream. Signed-off-by: Chris Packham --- ....c-provide-mp_raw_code_load_file-for-any-.patch | 27 ---------------------- package/micropython/micropython.hash | 1 + package/micropython/micropython.mk | 1 + 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch diff --git a/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch b/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch deleted file mode 100644 index 8465ce9..0000000 --- a/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4177e71862a2817d2555abd8d0bc9a8a361dad8a Mon Sep 17 00:00:00 2001 -From: Chris Packham -Date: Sat, 3 Sep 2016 20:44:12 +1200 -Subject: [PATCH] py/emitglue.c: provide mp_raw_code_load_file for any unix - architecture - -Signed-off-by: Chris Packham ---- - py/emitglue.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/py/emitglue.c b/py/emitglue.c -index 1b9992b..2e79d5f 100644 ---- a/py/emitglue.c -+++ b/py/emitglue.c -@@ -381,7 +381,7 @@ mp_raw_code_t *mp_raw_code_load_mem(const byte *buf, size_t len) { - // here we define mp_raw_code_load_file depending on the port - // TODO abstract this away properly - --#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && (defined(__unix__))) -+#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || defined(__unix__) - // unix file reader - - #include --- -2.9.2.518.ged577c6.dirty - diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index ea42bfb..a8ad2ba 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,2 +1,3 @@ #locally computed sha256 871378fcf1f1042c399896d5673da67d12e1fb36c2e706af289fc959bc8f7a57 micropython-v1.8.3.tar.gz +sha256 ff3194ebecda99023d7c1bb94d32b31b9491e95a79958a25ffd05213c5553acc 8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 047e340..590956e 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -9,6 +9,7 @@ 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 # Use fallback implementation for exception handling on architectures that don't # have explicit support.