Browse Source

Merge pull request #7145 from neheb/micro

micropython: Update to 1.94
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
eb046968e2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 39 deletions
  1. +10
    -14
      lang/python/micropython/Makefile
  2. +0
    -13
      lang/python/micropython/patches/000-Makefile-no-errors
  3. +13
    -0
      lang/python/micropython/patches/000-Makefile-no-errors.patch
  4. +0
    -12
      lang/python/micropython/patches/001-all-unix

+ 10
- 14
lang/python/micropython/Makefile View File

@ -8,21 +8,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=micropython
PKG_VERSION=1.9.2-$(PKG_SOURCE_VERSION)
PKG_VERSION:=1.9.4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/micropython/micropython/releases/download/v$(PKG_VERSION)
PKG_HASH:=0db042011bffcbd65362b67eb3cca87eaefa9f2a55b747fa75e922c706b8ce1a
PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/micropython/micropython.git
PKG_SOURCE_VERSION:=1f78e7a43130acfa4bedf16c1007a1b0f37c75c3
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz
PKG_MIRROR_HASH:=18234ffd1e91ac461080b4213399a6a18d4163fe314782b2e6ffbd1bfe48537b
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
@ -32,7 +28,7 @@ define Package/micropython
SECTION:=lang
CATEGORY:=Languages
TITLE:=Micro Python
URL:=http://micropython.org
URL:=https://micropython.org
DEPENDS:=+libffi
endef
@ -42,17 +38,17 @@ define Package/micropython/description
endef
MAKE_FLAGS += -C $(PKG_BUILD_DIR)/unix FROZEN_MPY_DIR=
MAKE_FLAGS += -C $(PKG_BUILD_DIR)/ports/unix FROZEN_MPY_DIR=
define Build/Compile
$(call Build/Compile/Default,axtls)
$(call Build/Compile/Default)
$(call Build/Compile/Default,axtls)
$(call Build/Compile/Default)
endef
define Package/micropython/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/unix/micropython $(1)/usr/bin/micropython
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ports/unix/micropython $(1)/usr/bin/micropython
endef
$(eval $(call BuildPackage,micropython))

+ 0
- 13
lang/python/micropython/patches/000-Makefile-no-errors View File

@ -1,13 +0,0 @@
Index: micropython-1.5-20161117-e81a5353cb794b8d6c57317488e5db6a1c524755/unix/Makefile
===================================================================
--- micropython-1.5-20161117-e81a5353cb794b8d6c57317488e5db6a1c524755.orig/unix/Makefile 2016-11-17 02:43:13.000000000 +0100
+++ micropython-1.5-20161117-e81a5353cb794b8d6c57317488e5db6a1c524755/unix/Makefile 2016-11-17 16:49:02.937809018 +0100
@@ -21,7 +21,7 @@
INC += -I$(BUILD)
# compiler settings
-CWARN = -Wall -Werror
+CWARN = -Wall
CWARN += -Wpointer-arith -Wuninitialized
CFLAGS = $(INC) $(CWARN) -ansi -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)

+ 13
- 0
lang/python/micropython/patches/000-Makefile-no-errors.patch View File

@ -0,0 +1,13 @@
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index cbdd3f3..0ab157d 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -21,7 +21,7 @@ INC += -I$(TOP)
INC += -I$(BUILD)
# compiler settings
-CWARN = -Wall -Werror
+CWARN = -Wall
CWARN += -Wpointer-arith -Wuninitialized
CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)

+ 0
- 12
lang/python/micropython/patches/001-all-unix View File

@ -1,12 +0,0 @@
--- a/py/persistentcode.c 2017-09-22 13:26:04.914339465 +0000
+++ b/py/persistentcode.c 2017-09-22 13:26:22.618319621 +0000
@@ -373,7 +373,7 @@
// here we define mp_raw_code_save_file depending on the port
// TODO abstract this away properly
-#if defined(__i386__) || defined(__x86_64__) || (defined(__arm__) && (defined(__unix__)))
+#if defined(__i386__) || defined(__x86_64__) || defined(__unix__)
#include <unistd.h>

Loading…
Cancel
Save