sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A fiew Micro Python build fixes. There are still issues

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-11 12:33:14 -06:00
parent c07914fa3c
commit 2297a7e36b
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
interpreters/micropython/.gitignore vendored
View File

@ -1,5 +1,6 @@
/micropython-* /micropython-*
/v*.tar.gz /v*.tar.gz
/build
/Make.dep /Make.dep
/.depend /.depend
/.built /.built

11
interpreters/micropython/Makefile
View File

@ -50,8 +50,9 @@ WGET ?= wget
MICROPYTHON_UNPACKNAME = micropython-$(MICROPYTHON_VERSION) MICROPYTHON_UNPACKNAME = micropython-$(MICROPYTHON_VERSION)
UNPACK ?= tar -zxf UNPACK ?= tar -zxf
MICROPYTHON_PATH = $(WD)/$(MICROPYTHON_UNPACKNAME)/py MICROPYTHON_UNPACKDIR = $(WD)/$(MICROPYTHON_UNPACKNAME)
-include $(MICROPYTHON_PATH)/mkenv.mk MICROPTHYON_SRCDIR = $(MICROPYTHON_UNPACKDIR)/py
-include $(MICROPTHYON_SRCDIR)/mkenv.mk
# qstr definitions (must come before including py.mk) # qstr definitions (must come before including py.mk)
@ -59,13 +60,13 @@ QSTR_DEFS = qstrdefsport.h
# include py core make definitions # include py core make definitions
-include $(MICROPYTHON_PATH)/py.mk -include $(MICROPTHYON_SRCDIR)/py.mk
# c99 is needed for micropython # c99 is needed for micropython
CFLAGS+=-std=c99 -Wno-shadow -Wno-strict-prototypes CFLAGS+=-std=c99 -Wno-shadow -Wno-strict-prototypes
INC = -I. -I$(WD) -I$(PY_SRC) -I$(BUILD) INC = -I. -I$(WD) -I$(MICROPYTHON_UNPACKDIR) -I$(PY_SRC) -I$(BUILD)
CFLAGS +=$(INC) CFLAGS +=$(INC)
@ -160,5 +161,5 @@ distclean: clean
$(call DELFILE, .downloaded) $(call DELFILE, .downloaded)
$(call DELFILE, .$(MICROPYTHON_TARBALL)) $(call DELFILE, .$(MICROPYTHON_TARBALL))
-include $(MICROPYTHON_PATH)/mkrules.mk -include $(MICROPTHYON_SRCDIR)/mkrules.mk
-include Make.dep -include Make.dep

2
interpreters/micropython/mpconfigport.h
View File

@ -41,7 +41,6 @@
****************************************************************************/ ****************************************************************************/
#include <stdint.h> #include <stdint.h>
#include <wchar_t.h>
/* We need to provide a declaration/definition of alloca() */ /* We need to provide a declaration/definition of alloca() */
@ -100,6 +99,7 @@
* Public Types * Public Types
****************************************************************************/ ****************************************************************************/
typedef int wint_t; /* For newlib's math.h. See wchar_t */
typedef int32_t mp_int_t; /* must be pointer size */ typedef int32_t mp_int_t; /* must be pointer size */
typedef uint32_t mp_uint_t; /* must be pointer size */ typedef uint32_t mp_uint_t; /* must be pointer size */
typedef void *machine_ptr_t; /* must be of pointer size */ typedef void *machine_ptr_t; /* must be of pointer size */

6
interpreters/micropython/pyexec.h
View File

@ -30,6 +30,12 @@
#ifndef __APPS_INTERPRETERS_MICROPYTHON_PYEXEC_H #ifndef __APPS_INTERPRETERS_MICROPYTHON_PYEXEC_H
#define __APPS_INTERPRETERS_MICROPYTHON_PYEXEC_H 1 #define __APPS_INTERPRETERS_MICROPYTHON_PYEXEC_H 1
/****************************************************************************
* Included Files
****************************************************************************/
#include "py/obj.h"
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/