mirror of
https://github.com/openwrt/packages.git
synced 2026-01-07 10:21:20 +00:00
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>
This commit is contained in:
@@ -8,12 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=micropython
|
||||
PKG_VERSION:=1.20.0
|
||||
PKG_VERSION:=1.21.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://github.com/micropython/micropython/releases/download/v$(PKG_VERSION)
|
||||
PKG_HASH:=098ef8e40abdc62551b5460d0ffe9489074240c0cb5589ca3c3a425551beb9bf
|
||||
PKG_HASH:=abd2152613559d3f44728668346e78be9d93458133a03b700baf222c322fd4d5
|
||||
|
||||
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
@@ -70,14 +70,20 @@ $(call Package/micropython/Default/description)
|
||||
This version is built without TLS and mip.
|
||||
endef
|
||||
|
||||
MAKE_FLAGS += BUILD_VERBOSE=1
|
||||
MAKE_FLAGS += BUILD_VERBOSE=1 STRIP=
|
||||
|
||||
ifneq ($(CONFIG_DEBUG),)
|
||||
MAKE_FLAGS += DEBUG=1
|
||||
endif
|
||||
|
||||
ifeq ($(BUILD_VARIANT),nossl)
|
||||
MAKE_FLAGS += MICROPY_PY_USSL=0 FROZEN_MANIFEST=variants/standard/manifest-nossl.py
|
||||
MAKE_FLAGS += MICROPY_PY_SSL=0 FROZEN_MANIFEST=variants/standard/manifest-nossl.py
|
||||
endif
|
||||
|
||||
# Work around "variable might be clobbered" warning leading to build error
|
||||
# https://github.com/micropython/micropython/issues/12838
|
||||
ifeq ($(ARCH),riscv64)
|
||||
MAKE_FLAGS += CFLAGS_EXTRA=-Wno-error=clobbered
|
||||
endif
|
||||
|
||||
MAKE_PATH = ports/unix
|
||||
@@ -89,20 +95,20 @@ define Build/Configure
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(2)/lib/micropython-$(PKG_VERSION)/mpy-cross
|
||||
$(INSTALL_DIR) $(2)/lib/micropython/mpy-cross
|
||||
$(CP) \
|
||||
$(PKG_BUILD_DIR)/mpy-cross/mpy_cross \
|
||||
$(2)/lib/micropython-$(PKG_VERSION)/mpy-cross/
|
||||
$(2)/lib/micropython/mpy-cross/
|
||||
|
||||
$(INSTALL_DIR) $(2)/lib/micropython-$(PKG_VERSION)/mpy-cross/build
|
||||
$(INSTALL_DIR) $(2)/lib/micropython/mpy-cross/build
|
||||
$(INSTALL_BIN) \
|
||||
$(PKG_BUILD_DIR)/mpy-cross/build/mpy-cross \
|
||||
$(2)/lib/micropython-$(PKG_VERSION)/mpy-cross/build/
|
||||
$(2)/lib/micropython/mpy-cross/build/
|
||||
|
||||
$(INSTALL_DIR) $(2)/lib/micropython-$(PKG_VERSION)/tools
|
||||
$(INSTALL_DIR) $(2)/lib/micropython/tools
|
||||
$(INSTALL_DATA) \
|
||||
$(PKG_BUILD_DIR)/tools/manifestfile.py \
|
||||
$(2)/lib/micropython-$(PKG_VERSION)/tools/
|
||||
$(2)/lib/micropython/tools/
|
||||
endef
|
||||
|
||||
define Package/micropython/Default/install
|
||||
|
||||
Reference in New Issue
Block a user