diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2023-10-15 22:16:44 +0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2023-11-01 15:57:40 -0700 |
| commit | db9202ccc52a3ef360cd1918db9376a5cfa4b25f (patch) | |
| tree | c104b3fb258221a8b9d44c5bb8970312730c4792 /lang/python/micropython/patches | |
| parent | dc52f47abbbba839fd89c84f4aacb74abd88757f (diff) | |
micropython: Update to 1.21.0, refresh/redo patches
Removed 050-py-stackctrl-fix-gcc-13.patch as it has been merged in the
new version.
This also:
* Add STRIP= (empty value) to skip micropython's stripping step, letting
the OpenWrt build system control stripping.
* Add a workaround for "variable might be clobbered" warning leading to
build error on riscv64
(https://github.com/micropython/micropython/issues/12838).
* Change Build/InstallDev to install host tools into an unversioned
directory, and update micropython-lib to use the unversioned path.
There is no need to keep available multiple versions of the host
tools.
* Add a test.sh script for the packages feed CI.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang/python/micropython/patches')
3 files changed, 5 insertions, 35 deletions
diff --git a/lang/python/micropython/patches/030-target-no-darwin.patch b/lang/python/micropython/patches/030-target-no-darwin.patch index a847e96b4..9dc4c59bc 100644 --- a/lang/python/micropython/patches/030-target-no-darwin.patch +++ b/lang/python/micropython/patches/030-target-no-darwin.patch @@ -1,7 +1,7 @@ --- a/ports/unix/Makefile +++ b/ports/unix/Makefile -@@ -31,7 +31,7 @@ QSTR_DEFS = qstrdefsport.h - QSTR_GLOBAL_DEPENDENCIES = $(VARIANT_DIR)/mpconfigvariant.h +@@ -31,7 +31,7 @@ QSTR_DEFS += qstrdefsport.h + QSTR_GLOBAL_DEPENDENCIES += $(VARIANT_DIR)/mpconfigvariant.h # OS name, for simple autoconfig -UNAME_S := $(shell uname -s) diff --git a/lang/python/micropython/patches/040-extmod-use-external-mbedtls.patch b/lang/python/micropython/patches/040-extmod-use-external-mbedtls.patch index dccd5ba51..3399412e4 100644 --- a/lang/python/micropython/patches/040-extmod-use-external-mbedtls.patch +++ b/lang/python/micropython/patches/040-extmod-use-external-mbedtls.patch @@ -9,7 +9,7 @@ Subject: [PATCH 06/10] extmod: Use system mbedtls --- a/extmod/extmod.mk +++ b/extmod/extmod.mk -@@ -131,84 +131,8 @@ SRC_THIRDPARTY_C += $(addprefix $(AXTLS_ +@@ -131,85 +131,8 @@ SRC_THIRDPARTY_C += $(addprefix $(AXTLS_ crypto/sha1.c \ ) else ifeq ($(MICROPY_SSL_MBEDTLS),1) @@ -54,7 +54,6 @@ Subject: [PATCH 06/10] extmod: Use system mbedtls - md4.c \ - md5.c \ - md.c \ -- md_wrap.c \ - oid.c \ - padlock.c \ - pem.c \ @@ -79,9 +78,11 @@ Subject: [PATCH 06/10] extmod: Use system mbedtls - ssl_cli.c \ - ssl_cookie.c \ - ssl_srv.c \ +- ssl_msg.c \ - ssl_ticket.c \ - ssl_tls.c \ - timing.c \ +- constant_time.c \ - x509.c \ - x509_create.c \ - x509_crl.c \ diff --git a/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch b/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch deleted file mode 100644 index 8cd7df66e..000000000 --- a/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f1c6cb7725960487195daa5c5c196fd8d3563811 Mon Sep 17 00:00:00 2001 -From: Damien George <damien@micropython.org> -Date: Wed, 3 May 2023 15:23:24 +1000 -Subject: [PATCH] py/stackctrl: Add gcc pragmas to ignore dangling-pointer - warning. - -This warning became apparent in gcc 13. - -Signed-off-by: Damien George <damien@micropython.org> ---- - py/stackctrl.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/py/stackctrl.c -+++ b/py/stackctrl.c -@@ -28,8 +28,15 @@ - #include "py/stackctrl.h" - - void mp_stack_ctrl_init(void) { -+ #if __GNUC__ >= 13 -+ #pragma GCC diagnostic push -+ #pragma GCC diagnostic ignored "-Wdangling-pointer" -+ #endif - volatile int stack_dummy; - MP_STATE_THREAD(stack_top) = (char *)&stack_dummy; -+ #if __GNUC__ >= 13 -+ #pragma GCC diagnostic pop -+ #endif - } - - void mp_stack_set_top(void *top) { |