Module Name: othersrc
Committed By: agc
Date: Thu Jan 14 01:44:20 UTC 2016
Modified Files:
othersrc/external/mit/micropython/dist/lib/utils: pyexec.c
othersrc/external/mit/micropython/dist/py: modsys.c qstr.c qstr.h
othersrc/external/mit/micropython/dist/unix: Makefile main.c
mpconfigport.h mpconfigport_minimal.h
Log Message:
Build fixes for NetBSD and reachover infrastructure
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/mit/micropython/dist/lib/utils/pyexec.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/mit/micropython/dist/py/modsys.c \
othersrc/external/mit/micropython/dist/py/qstr.c \
othersrc/external/mit/micropython/dist/py/qstr.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/mit/micropython/dist/unix/Makefile \
othersrc/external/mit/micropython/dist/unix/main.c \
othersrc/external/mit/micropython/dist/unix/mpconfigport.h \
othersrc/external/mit/micropython/dist/unix/mpconfigport_minimal.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/mit/micropython/dist/lib/utils/pyexec.c
diff -u othersrc/external/mit/micropython/dist/lib/utils/pyexec.c:1.1.1.1 othersrc/external/mit/micropython/dist/lib/utils/pyexec.c:1.2
--- othersrc/external/mit/micropython/dist/lib/utils/pyexec.c:1.1.1.1 Thu Jan 14 01:38:49 2016
+++ othersrc/external/mit/micropython/dist/lib/utils/pyexec.c Thu Jan 14 01:44:20 2016
@@ -42,7 +42,7 @@
#endif
#include "readline.h"
#include "lib/utils/pyexec.h"
-#include "genhdr/mpversion.h"
+#include "mpversion.h"
pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
STATIC bool repl_display_debugging_info = 0;
Index: othersrc/external/mit/micropython/dist/py/modsys.c
diff -u othersrc/external/mit/micropython/dist/py/modsys.c:1.1.1.1 othersrc/external/mit/micropython/dist/py/modsys.c:1.2
--- othersrc/external/mit/micropython/dist/py/modsys.c:1.1.1.1 Thu Jan 14 01:38:50 2016
+++ othersrc/external/mit/micropython/dist/py/modsys.c Thu Jan 14 01:44:20 2016
@@ -35,7 +35,7 @@
#if MICROPY_PY_SYS
-#include "genhdr/mpversion.h"
+#include "mpversion.h"
/// \module sys - system specific functions
Index: othersrc/external/mit/micropython/dist/py/qstr.c
diff -u othersrc/external/mit/micropython/dist/py/qstr.c:1.1.1.1 othersrc/external/mit/micropython/dist/py/qstr.c:1.2
--- othersrc/external/mit/micropython/dist/py/qstr.c:1.1.1.1 Thu Jan 14 01:38:50 2016
+++ othersrc/external/mit/micropython/dist/py/qstr.c Thu Jan 14 01:44:20 2016
@@ -94,7 +94,7 @@ STATIC const qstr_pool_t const_pool = {
MP_QSTR_number_of, // corresponds to number of strings in array just below
{
#define QDEF(id, str) str,
-#include "genhdr/qstrdefs.generated.h"
+#include "qstrdefs.generated.h"
#undef QDEF
},
};
Index: othersrc/external/mit/micropython/dist/py/qstr.h
diff -u othersrc/external/mit/micropython/dist/py/qstr.h:1.1.1.1 othersrc/external/mit/micropython/dist/py/qstr.h:1.2
--- othersrc/external/mit/micropython/dist/py/qstr.h:1.1.1.1 Thu Jan 14 01:38:50 2016
+++ othersrc/external/mit/micropython/dist/py/qstr.h Thu Jan 14 01:44:20 2016
@@ -38,7 +38,7 @@
// first entry in enum will be MP_QSTR_NULL=0, which indicates invalid/no qstr
enum {
#define QDEF(id, str) id,
-#include "genhdr/qstrdefs.generated.h"
+#include "qstrdefs.generated.h"
#undef QDEF
MP_QSTR_number_of,
};
Index: othersrc/external/mit/micropython/dist/unix/Makefile
diff -u othersrc/external/mit/micropython/dist/unix/Makefile:1.1.1.1 othersrc/external/mit/micropython/dist/unix/Makefile:1.2
--- othersrc/external/mit/micropython/dist/unix/Makefile:1.1.1.1 Thu Jan 14 01:38:51 2016
+++ othersrc/external/mit/micropython/dist/unix/Makefile Thu Jan 14 01:44:20 2016
@@ -16,6 +16,7 @@ include ../py/py.mk
INC += -I.
INC += -I..
INC += -I$(BUILD)
+INC += -I$(BUILD)/genhdr
# compiler settings
CWARN = -Wall -Werror
@@ -196,7 +197,7 @@ $(BUILD)/_frozen_upip.c: $(BUILD)/frozen
../tools/make-frozen.py $(dir $^) > $@
# Select latest upip version available
-UPIP_TARBALL := $(shell ls -1 -v ../tools/micropython-upip-*.tar.gz | tail -n1)
+UPIP_TARBALL := $(shell ls -1 ../tools/micropython-upip-*.tar.gz | tail -n1)
$(BUILD)/frozen_upip/upip.py: $(UPIP_TARBALL)
$(ECHO) "MISC Preparing upip as frozen module"
@@ -224,10 +225,10 @@ libffi:
cd ../lib/libffi; ./autogen.sh
mkdir -p ../lib/libffi/build_dir; cd ../lib/libffi/build_dir; \
../configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; \
- make install-exec-recursive; make -C include install-data-am
+ $(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
axtls:
cd ../lib/axtls; cp config/upyconfig config/.config
- cd ../lib/axtls; make oldconfig -B
- cd ../lib/axtls; make clean
- cd ../lib/axtls; make all CC="$(CC)" LD="$(LD)"
+ cd ../lib/axtls; $(MAKE) oldconfig -B
+ cd ../lib/axtls; $(MAKE) clean
+ cd ../lib/axtls; $(MAKE) all CC="$(CC)" LD="$(LD)"
Index: othersrc/external/mit/micropython/dist/unix/main.c
diff -u othersrc/external/mit/micropython/dist/unix/main.c:1.1.1.1 othersrc/external/mit/micropython/dist/unix/main.c:1.2
--- othersrc/external/mit/micropython/dist/unix/main.c:1.1.1.1 Thu Jan 14 01:38:51 2016
+++ othersrc/external/mit/micropython/dist/unix/main.c Thu Jan 14 01:44:20 2016
@@ -45,7 +45,7 @@
#include "py/gc.h"
#include "py/stackctrl.h"
#include "py/mphal.h"
-#include "genhdr/mpversion.h"
+#include "mpversion.h"
#include "input.h"
// Command line options, with their defaults
Index: othersrc/external/mit/micropython/dist/unix/mpconfigport.h
diff -u othersrc/external/mit/micropython/dist/unix/mpconfigport.h:1.1.1.1 othersrc/external/mit/micropython/dist/unix/mpconfigport.h:1.2
--- othersrc/external/mit/micropython/dist/unix/mpconfigport.h:1.1.1.1 Thu Jan 14 01:38:51 2016
+++ othersrc/external/mit/micropython/dist/unix/mpconfigport.h Thu Jan 14 01:44:20 2016
@@ -261,7 +261,8 @@ void mp_hal_dupterm_tx_strn(const char *
// We need to provide a declaration/definition of alloca()
// unless support for it is disabled.
#if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0
-#ifdef __FreeBSD__
+#include <sys/param.h>
+#if (defined(BSD) && BSD >= 199506)
#include <stdlib.h>
#else
#include <alloca.h>
Index: othersrc/external/mit/micropython/dist/unix/mpconfigport_minimal.h
diff -u othersrc/external/mit/micropython/dist/unix/mpconfigport_minimal.h:1.1.1.1 othersrc/external/mit/micropython/dist/unix/mpconfigport_minimal.h:1.2
--- othersrc/external/mit/micropython/dist/unix/mpconfigport_minimal.h:1.1.1.1 Thu Jan 14 01:38:51 2016
+++ othersrc/external/mit/micropython/dist/unix/mpconfigport_minimal.h Thu Jan 14 01:44:20 2016
@@ -128,7 +128,8 @@ typedef const void *machine_const_ptr_t;
mp_obj_t keyboard_interrupt_obj;
// We need to provide a declaration/definition of alloca()
-#ifdef __FreeBSD__
+#include <sys/param.h>
+#if (defined(BSD) && BSD >= 199506)
#include <stdlib.h>
#else
#include <alloca.h>
