Closed moaxey closed 5 years ago
Thanks for spotting the problem and finding a work around.
See also https://github.com/fupy/micropython/issues/56 (which I created, when I found this issue a week or so ago), which references the upstream patch for this (https://github.com/micropython/micropython/commit/7bbde67cb2dc52c04bd7020689a1227bddfa1b06).
I think it'd be better to:
Fast forward our MicroPython to match upstream (see https://github.com/fupy/micropython/issues/56#issuecomment-514870675 for hints from upstream on what else might need changing), which would pick up their patch for this issue; or
Cherry Pick the upstream patch exactly, from https://github.com/micropython/micropython/commit/7bbde67cb2dc52c04bd7020689a1227bddfa1b06, so we'll at least have matching code and can skip that whole patch when catching up to upstream.
I'd rather not apply patches outside of ports/fupy
which (a) won't be going upstream and (b) are known to conflict with patches which are upstream.
Ewen
PS: I have a feeling that we have the upstream .travis.yml
, but none of the other Travis setup for it to work with cross compiles, etc. See, eg, https://github.com/fupy/micropython/issues/14
Tested and worked for me to compilation
@whatnick It works for me too (see https://github.com/fupy/micropython/issues/56, where I did basically the same thing). But for the reasons I stated in https://github.com/fupy/micropython/pull/57#issuecomment-518404042, I think it's an unfortunate idea to merge a patch which will conflict with upstream. It'd be much better to merge the actual upstream patch (https://github.com/micropython/micropython/commit/7bbde67cb2dc52c04bd7020689a1227bddfa1b06) literally (so it won't conflict later), or fast forward our micropython fork to match upstream (thus also picking up their patch).
Ewen
I have rebased our changes on top of micropython/micropython@master (3d02ebb4e8262b67433eadc80100155387c6f186), so this build error should no longer occur.
Similar to https://github.com/micropython/micropython/issues/4457