testing/micropython: upgrade to 1.21.0

This commit is contained in:
Celeste 2023-10-07 03:09:50 +00:00 committed by Andy Postnikov
parent 87ca28e315
commit fe4839d314
5 changed files with 29 additions and 27 deletions

View File

@ -1,7 +1,7 @@
# Contributor: Marian <marian.buschsieweke@ovgu.de> # Contributor: Marian <marian.buschsieweke@ovgu.de>
# Maintainer: Marian <marian.buschsieweke@ovgu.de> # Maintainer: Marian <marian.buschsieweke@ovgu.de>
pkgname=micropython pkgname=micropython
pkgver=1.20.0 pkgver=1.21.0
pkgrel=0 pkgrel=0
pkgdesc="lean and efficient Python implementation for MCUs and constrained systems" pkgdesc="lean and efficient Python implementation for MCUs and constrained systems"
url="https://www.micropython.org/" url="https://www.micropython.org/"
@ -15,9 +15,9 @@ makedepends="libffi-dev python3"
subpackages="$pkgname-cross" subpackages="$pkgname-cross"
source="https://github.com/micropython/micropython/releases/download/v$pkgver/micropython-$pkgver.tar.xz source="https://github.com/micropython/micropython/releases/download/v$pkgver/micropython-$pkgver.tar.xz
micropython-1.9.4-prevent-stripping.patch micropython-1.9.4-prevent-stripping.patch
no_ussl.patch no_ssl.patch
no_legacy_berkeley_db.patch no_legacy_berkeley_db.patch
mpy-cross-no-werror.patch no-werror.patch
" "
build() { build() {
@ -52,9 +52,9 @@ cross() {
} }
sha512sums=" sha512sums="
6ad69d1d14d77555e36177344410c9d04f0d3bac009f01cc0239c5e85e9ae4cb13e6bcecc250ce5b3f55b15b507af89df0352ccef358db5905091e09ab3988d0 micropython-1.20.0.tar.xz 219eb1264378bbcdfe8fce9f2b41a4eb081deb0dbf7ad14420595358e6e785b5926acf04fac92744b8fc1e3a4e5e1c5a65d6aff5083a1fadf5c33b16212ad8f4 micropython-1.21.0.tar.xz
eff33f41757048113d013cb30566c5d1eed72fdbd3cd7b046655efb168f39165e3bb17fa3c29a8f27039393db9363a8a12b9d75faa21fc6c370b16500a54ef52 micropython-1.9.4-prevent-stripping.patch 47f4923b1901bf0c8c90a15fe7188ae5c07d4c451d129c271d52d9449ac6094bf7183d5c4dc9cb38d5d5b4bf6944a715b7a3377575e9bc92bee16801d8088436 micropython-1.9.4-prevent-stripping.patch
35adb162eb3ffba6c17128281a4d1d4dc19807d3355f365bee89c1da61d442d4f66528335bcff77fb5a792238eb17692c6a785181236f33bb367b5c1ac3e15b3 no_ussl.patch 6e13449a4d273538d9d752de88a292ff15ef035ca55abc8c5ee4b396d3088c292f059e59a9b17594d02393a0deb28f309d6fde057ba9c2bd91e58b99f55d7c97 no_ssl.patch
e86ad02ef746605f2f685ae776a6ad6ea39ae6e57fa0869a0c03895fd581647de20fa7e6aaeebac45e7302a63451d625208b1356ee2f35a66df70ac2755a25ff no_legacy_berkeley_db.patch e86ad02ef746605f2f685ae776a6ad6ea39ae6e57fa0869a0c03895fd581647de20fa7e6aaeebac45e7302a63451d625208b1356ee2f35a66df70ac2755a25ff no_legacy_berkeley_db.patch
8b65a2a7bdfe81aac34cddb5eee0845686f3c31253744258a47ba74fc3e20a4adcaa4dfba98e4e3cba151aeadc4ca22a6a5457dc6b40a1800ca074856d43121c mpy-cross-no-werror.patch 99a021dc8fe8f7cd26455e9e7610e36bfb3c01182b42855a6cc3453dea29ea25fe622c3d722a71f973a1382446f6434260cc2a986d92895e187e784c57069b31 no-werror.patch
" "

View File

@ -1,6 +1,6 @@
--- a/py/mkenv.mk 2017-11-25 09:52:30.921836372 +0000 --- a/py/mkenv.mk
+++ a/py/mkenv.mk 2017-11-25 09:52:35.257861233 +0000 +++ a/py/mkenv.mk
@@ -50,7 +50,6 @@ @@ -52,7 +52,6 @@
LD = $(CROSS_COMPILE)ld LD = $(CROSS_COMPILE)ld
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
SIZE = $(CROSS_COMPILE)size SIZE = $(CROSS_COMPILE)size
@ -8,14 +8,16 @@
AR = $(CROSS_COMPILE)ar AR = $(CROSS_COMPILE)ar
MAKE_MANIFEST = $(PYTHON) $(TOP)/tools/makemanifest.py MAKE_MANIFEST = $(PYTHON) $(TOP)/tools/makemanifest.py
--- a/py/mkrules.mk 2017-11-25 09:53:13.107078063 +0000 --- a/py/mkrules.mk
+++ a/py/mkrules.mk 2017-11-25 09:53:31.898185592 +0000 +++ a/py/mkrules.mk
@@ -198,9 +198,6 @@ @@ -211,11 +211,6 @@
# Do not pass COPT here - it's *C* compiler optimizations. For example, # Do not pass COPT here - it's *C* compiler optimizations. For example,
# we may want to compile using Thumb, but link with non-Thumb libc. # we may want to compile using Thumb, but link with non-Thumb libc.
$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS) $(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
-ifndef DEBUG -ifndef DEBUG
-ifdef STRIP
- $(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $@ - $(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $@
-endif
-endif -endif
$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $@ $(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $@

View File

@ -1,11 +0,0 @@
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -17,7 +17,7 @@
INC += -I$(TOP)
# compiler settings
-CWARN = -Wall -Werror
+CWARN = -Wall
CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith
CFLAGS += $(INC) $(CWARN) -std=gnu99 $(COPT) $(CFLAGS_EXTRA)
CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables

View File

@ -0,0 +1,11 @@
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -44,7 +44,7 @@
INC += -I$(BUILD)
# compiler settings
-CWARN = -Wall -Werror
+CWARN = -Wall
CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)

View File

@ -3,9 +3,9 @@
@@ -24,13 +24,13 @@ @@ -24,13 +24,13 @@
MICROPY_PY_FFI = 1 MICROPY_PY_FFI = 1
# ussl module requires one of the TLS libraries below # ssl module requires one of the TLS libraries below
-MICROPY_PY_USSL = 1 -MICROPY_PY_SSL = 1
+MICROPY_PY_USSL = 0 +MICROPY_PY_SSL = 0
# axTLS has minimal size but implements only a subset of modern TLS # axTLS has minimal size but implements only a subset of modern TLS
# functionality, so may have problems with some servers. # functionality, so may have problems with some servers.
MICROPY_SSL_AXTLS = 0 MICROPY_SSL_AXTLS = 0