From patchwork Sat Sep 3 09:15:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 665416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sR9ND3pz8z9sD5 for ; Sat, 3 Sep 2016 19:16: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=JivGUgdu; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9F5BC8D91F; Sat, 3 Sep 2016 09:16:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ysrhFGN-1S7l; Sat, 3 Sep 2016 09:16:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 18B0B8DAD9; Sat, 3 Sep 2016 09:16:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A6A3D1C16B0 for ; Sat, 3 Sep 2016 09:16:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A1AEFC0A77 for ; Sat, 3 Sep 2016 09:16:22 +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 gBCX5ERHJYM7 for ; Sat, 3 Sep 2016 09:16:22 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 06F78C0A6C for ; Sat, 3 Sep 2016 09:16:22 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id i6so6841228pfe.0 for ; Sat, 03 Sep 2016 02:16:22 -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=c/sBlcKsdfm4or/nyf8QGMbFj0ANJl5MBNIavMPakfU=; b=JivGUgduNRzOM675BpKAXuc6MLKlO3oEBwlpJ9K2+SMeqWqGugU2EK55SXp8a1jE8Y +7FkQNNL53gDZlwjH+peqMt6K+z3Ugx16aDesxTOj5MJkw/bcrhM5o10w4mm9iNAKx90 lIxUIYq6kPBihaw2lWqI/QaxORuv/prfWpKHwMAzjv1xDcoTFm+NMNZplIYwa6j8Bblk 5cmSs9pDxzHUPu/GPN3KAOgHHEZpWSwHVIRmqw7IZeT3dNOkHVnqU4w0ugWQJiNg1EqB oW2R1fwnzQB7gy4WbYTleL0s6upXQ7yu8k8BbbEZUGNzKQDGfNixQKl1quZYXPeg3tP9 qy1g== 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=c/sBlcKsdfm4or/nyf8QGMbFj0ANJl5MBNIavMPakfU=; b=V2qkOReM35kXitpfrifpFwoKPjRUBUp1+sLQahMFDTd5XF8+xz2RxCtdcoCWVZyXRX 8nXp0xNoxP3Dc8qrPkwpBK2GUSZswU6wXQPIf/Rmmpt6mtJQh3nIP71Mt4r3y3ril+NS 9dO68/P/CfLx7frRAO0oyTHxz3cpwSaKCO/4voMs+mzSTpmpw+GrrjZIqNJcNeeV4S+M wtj9QsDvYSZQG1P6z0ovAcChQ7G1G3RzBGLAuJyut1jJlrxjzJ1HGNSkc8Moje6Jvc+s JqwroKv0ntMXbdKFoIlyaPMdRmO/YIQSOpz/AAnICuBvL3N43lBHvRo4/Pr8iNYj7ebz 03pA== X-Gm-Message-State: AE9vXwM2DqzG+TPXoEKlLBRe8VxFJ100jtJyvPtPxCnUdJ/aXrOuaJnWDYyEiQ1G59/4Lw== X-Received: by 10.98.93.204 with SMTP id n73mr43999518pfj.87.1472894181689; Sat, 03 Sep 2016 02:16:21 -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 d5sm20272676pfa.44.2016.09.03.02.16.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Sep 2016 02:16:18 -0700 (PDT) From: Chris Packham To: buildroot@buildroot.org Date: Sat, 3 Sep 2016 21:15:35 +1200 Message-Id: <20160903091535.7833-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.9.2.518.ged577c6.dirty Subject: [Buildroot] [RFC PATCH] micropython: 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" Fixes: http://autobuild.buildroot.net/results/061c66987e9c33a6641c8183f5e0badae516fc1d http://autobuild.buildroot.net/results/62e5b5c6d9dca0f41fb4e7d462ebfbb02f8d29da http://autobuild.buildroot.net/results/a6437a49659a7b2983269e758dba9fa5a29240d7 Signed-off-by: Chris Packham --- I'll look at getting this fix upstream so consider this patch temporary. ....c-provide-mp_raw_code_load_file-for-any-.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create 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 new file mode 100644 index 0000000..8465ce9 --- /dev/null +++ b/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch @@ -0,0 +1,27 @@ +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 +