[Buildroot] [PATCHv3 0/3] micropython build fixes

[Buildroot] [PATCHv3 0/3] micropython build fixes

[Chris Packham]

The first 2 patches are unchanged from the ones sent individually to the
list, the third is new and includes upstream fixes that we were already
carrying as patches.

Chris Packham (3):
  micropython: Invert fallback detection logic
  micropython: Disable for Blackfin
  micropython: Bump version to v1.4.6

 package/micropython/Config.in      | 3 +++
 package/micropython/micropython.mk | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.5.0

[Buildroot] [PATCHv3 1/3] micropython: Invert fallback detection logic

[Chris Packham]

Rather than specifying architectures that do not have explicit support
in micropython invert the logic and set MICROPY_GCREGS_SETJMP=1 if the
architecture does not have explicit support. MIPS is listed as being
supported but this support consists of automatically defining
MICROPY_GCREGS_SETJMP 1 based on __mips__ being defined.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
This should clean up most of the remaining build failures. Listing the
architectures with explicit support makes more sense to me and is
certainly a shorter list at the moment.
    
Changes since v1:
- Use positive logic ifeq(,) instead of ifneq(,y)
Changes since v2:
- none

 package/micropython/micropython.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk
index 7ae88a0..1358864 100644
--- a/package/micropython/micropython.mk
+++ b/package/micropython/micropython.mk
@@ -15,7 +15,7 @@ MICROPYTHON_PATCH = \
 
 # Use fallback implementation for exception handling on architectures that don't
 # have explicit support.
-ifeq ($(BR2_powerpc)$(BR2_sh)$(BR2_xtensa),y)
+ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),)
 MICROPYTHON_CFLAGS = -DMICROPY_GCREGS_SETJMP=1
 endif
 
-- 
2.5.0

[Buildroot] [PATCHv3 2/3] micropython: Disable for Blackfin

[Chris Packham]

There are two problems building micropython for Blackfin. The first is
some printf format specifier warnings/errors that seem to be triggered
only for that architecture/compiler. This could be worked around by
specifying CFLAGS=-Wno-error=format.

The second problem is that libffi doesn't provide the closure
implementation on Blackfin. There is no known workaround for this issue.

For now disable micropython on Blackfin.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
Changes since v1:
- Supress comment section on bfin also
- Re-order depends to list !BR2_bfin last
Changes since v2:
- None

 package/micropython/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/micropython/Config.in b/package/micropython/Config.in
index c62b3ab..dae41b7 100644
--- a/package/micropython/Config.in
+++ b/package/micropython/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_MICROPYTHON
 	bool "micropython"
 	select BR2_PACKAGE_LIBFFI
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# libffi doesn't provide the closure implementation on Blackfin
+	depends on !BR2_bfin
 	help
 	  Micro Python is a lean and fast implementation of the Python 3
 	  programming language that is optimised to run on a microcontroller.
@@ -10,3 +12,4 @@ config BR2_PACKAGE_MICROPYTHON
 
 comment "micropython needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_bfin
-- 
2.5.0

[Buildroot] [PATCHv3 3/3] micropython: Bump version to v1.4.6

[Chris Packham]

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
This incorporates some build fixes that we were carrying as separate
patches. Build tested for x86 and mips32.

Changes since v1/v2
- New patch

 package/micropython/micropython.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk
index 1358864..f5e0ce7 100644
--- a/package/micropython/micropython.mk
+++ b/package/micropython/micropython.mk
@@ -4,14 +4,11 @@
 #
 ################################################################################
 
-MICROPYTHON_VERSION = v1.4.5
+MICROPYTHON_VERSION = v1.4.6
 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/8b4fb4fe140e9cf57fcfa258d0d2d6fe19090fc5.patch \
-	https://github.com/micropython/micropython/commit/587914169cc6ff7f0513bd14c42dcbb275bf77bd.patch
 
 # Use fallback implementation for exception handling on architectures that don't
 # have explicit support.
-- 
2.5.0

[Buildroot] [PATCHv3 0/3] micropython build fixes

[Peter Korsgaard]

>>>>> "Chris" == Chris Packham <judge.packham@gmail.com> writes:

 > The first 2 patches are unchanged from the ones sent individually to the
 > list, the third is new and includes upstream fixes that we were already
 > carrying as patches.

 > Chris Packham (3):
 >   micropython: Invert fallback detection logic
 >   micropython: Disable for Blackfin
 >   micropython: Bump version to v1.4.6

Committed series, thanks.

-- 
Venlig hilsen,
Peter Korsgaard