From fe55d3e0166b6c6ff189fb7a854847bad4fcd6b6 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 29 Jun 2022 12:08:12 +1000 Subject: [PATCH] unix/variants: Move setting of MICROPY_PY_USELECT to port config file. The default is the same as before: MICROPY_PY_USELECT=0 and MICROPY_PY_USELECT_POSIX=1. But now this can be easily overridden at the make command-line using, eg: make VARIANT=dev CFLAGS_EXTRA=-DMICROPY_PY_USELECT=1 Signed-off-by: Damien George --- ports/unix/mpconfigport.h | 5 ++++- ports/unix/variants/coverage/mpconfigvariant.h | 1 - ports/unix/variants/dev/mpconfigvariant.h | 1 - ports/unix/variants/standard/mpconfigvariant.h | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h index a483c3e086..232bfb857c 100644 --- a/ports/unix/mpconfigport.h +++ b/ports/unix/mpconfigport.h @@ -179,8 +179,11 @@ #define MICROPY_PY_UHASHLIB_SHA1 (1) #define MICROPY_PY_UCRYPTOLIB (1) #endif +#ifndef MICROPY_PY_USELECT +#define MICROPY_PY_USELECT (0) +#endif #ifndef MICROPY_PY_USELECT_POSIX -#define MICROPY_PY_USELECT_POSIX (1) +#define MICROPY_PY_USELECT_POSIX (!MICROPY_PY_USELECT) #endif #define MICROPY_PY_UWEBSOCKET (1) #define MICROPY_PY_MACHINE (1) diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h index bf68dcb63a..47ed4bc46c 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.h +++ b/ports/unix/variants/coverage/mpconfigvariant.h @@ -33,7 +33,6 @@ // Disable some features that come enabled by default with the feature level. #define MICROPY_PY_BUILTINS_EXECFILE (0) #define MICROPY_PY_SYS_STDIO_BUFFER (0) -#define MICROPY_PY_USELECT (0) // Enable additional features. #define MICROPY_DEBUG_PARSE_RULE_NAME (1) diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h index 61092394cd..0603394247 100644 --- a/ports/unix/variants/dev/mpconfigvariant.h +++ b/ports/unix/variants/dev/mpconfigvariant.h @@ -30,7 +30,6 @@ // Disable some features that come enabled by default with the feature level. #define MICROPY_PY_BUILTINS_EXECFILE (0) #define MICROPY_PY_SYS_STDIO_BUFFER (0) -#define MICROPY_PY_USELECT (0) // Enable some additional features. #define MICROPY_REPL_EMACS_WORDS_MOVE (1) diff --git a/ports/unix/variants/standard/mpconfigvariant.h b/ports/unix/variants/standard/mpconfigvariant.h index 1ec46ef92d..31618652e9 100644 --- a/ports/unix/variants/standard/mpconfigvariant.h +++ b/ports/unix/variants/standard/mpconfigvariant.h @@ -38,7 +38,6 @@ #define MICROPY_PY_MATH_FACTORIAL (0) #define MICROPY_PY_SYS_PS1_PS2 (0) #define MICROPY_PY_SYS_STDIO_BUFFER (0) -#define MICROPY_PY_USELECT (0) #define MICROPY_PY_UASYNCIO (0) #define MICROPY_PY_URE_SUB (0) #define MICROPY_PY_URANDOM_EXTRA_FUNCS (0)