From cd5522965b11d19a5791bc214a9aaa98d3947954 Mon Sep 17 00:00:00 2001
From: yggdr <github@schukraft.org>
Date: Tue, 31 May 2022 18:47:06 +0200
Subject: [PATCH] Pass through CFLAGS_EXTRA for Micropython (#2007)

Co-authored-by: Ivan Pozdeev <vano@mail.mipt.ru>
---
 plugins/python-build/bin/python-build   |  2 +-
 plugins/python-build/test/compiler.bats | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 284dec91..eefeb001 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -899,7 +899,7 @@ build_package_micropython() {
     "$MAKE" $MAKE_OPTS
     cd ../ports/unix
     "$MAKE" $MAKE_OPTS axtls
-    "$MAKE" $MAKE_OPTS CFLAGS_EXTRA="-DMICROPY_PY_SYS_PATH_DEFAULT='\"${PREFIX_PATH}/lib/micropython\"'"
+    "$MAKE" $MAKE_OPTS CFLAGS_EXTRA="-DMICROPY_PY_SYS_PATH_DEFAULT='\"${PREFIX_PATH}/lib/micropython\"' $CFLAGS_EXTRA"
     "$MAKE" install $MAKE_INSTALL_OPTS PREFIX="${PREFIX_PATH}"
     ln -fs micropython "${PREFIX_PATH}/bin/python"
     mkdir -p "${PREFIX_PATH}/lib/micropython"
diff --git a/plugins/python-build/test/compiler.bats b/plugins/python-build/test/compiler.bats
index c07f12c4..70049d75 100644
--- a/plugins/python-build/test/compiler.bats
+++ b/plugins/python-build/test/compiler.bats
@@ -97,3 +97,24 @@ make -j 2
 make install
 OUT
 }
+
+@test "passthrough CFLAGS_EXTRA to micropython compiler" {
+    mkdir -p "$INSTALL_ROOT/mpy-cross"
+    mkdir -p "$INSTALL_ROOT/ports/unix"
+    mkdir -p "$INSTALL_ROOT/bin"
+    # touch "$INSTALL_ROOT/bin/python"
+    cd "$INSTALL_ROOT"
+
+    stub make true true '(for a in "$@"; do echo $a; done)|grep -E "^CFLAGS_EXTRA="' true
+    stub ln true
+    stub mkdir true
+    run_inline_definition <<DEF
+exec 4<&1
+CFLAGS_EXTRA='-Wno-floating-conversion' build_package_micropython
+DEF
+
+    #assert_success
+    assert_output <<OUT
+CFLAGS_EXTRA=-DMICROPY_PY_SYS_PATH_DEFAULT='"${TMP}/install/lib/micropython"' -Wno-floating-conversion
+OUT
+}