djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix/Makefile: Don't use _MOD variable names.

Browse Source 
This conflicts with the triple-usage of these variables for user-C-modules
and extmod source.

For CFLAGS_MOD, just use CFLAGS directly. For SRC, use SRC_C directly as
the relevant files are all guarded by the preprocessor anyway.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2022-10-08 23:38:18 +11:00 committed by Damien George
parent 3cc6decfc4
commit 065af04a4e
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ports/unix/Makefile
View File

@ -110,27 +110,25 @@ ifeq ($(MICROPY_FORCE_32BIT),1)
# starting with linux-libc-dev:i386 # starting with linux-libc-dev:i386
ifeq ($(MICROPY_PY_FFI),1) ifeq ($(MICROPY_PY_FFI),1)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
CFLAGS_MOD += -I/usr/include/i686-linux-gnu CFLAGS += -I/usr/include/i686-linux-gnu
endif endif
endif endif
endif endif
ifeq ($(MICROPY_USE_READLINE),1) ifeq ($(MICROPY_USE_READLINE),1)
INC += -I$(TOP)/shared/readline INC += -I$(TOP)/shared/readline
CFLAGS_MOD += -DMICROPY_USE_READLINE=1 CFLAGS += -DMICROPY_USE_READLINE=1
SHARED_SRC_C_EXTRA += readline/readline.c SHARED_SRC_C_EXTRA += readline/readline.c
endif endif
ifeq ($(MICROPY_PY_TERMIOS),1) ifeq ($(MICROPY_PY_TERMIOS),1)
CFLAGS_MOD += -DMICROPY_PY_TERMIOS=1 CFLAGS += -DMICROPY_PY_TERMIOS=1
SRC_MOD += modtermios.c
endif endif
ifeq ($(MICROPY_PY_SOCKET),1) ifeq ($(MICROPY_PY_SOCKET),1)
CFLAGS_MOD += -DMICROPY_PY_SOCKET=1 CFLAGS += -DMICROPY_PY_SOCKET=1
SRC_MOD += modusocket.c
endif endif
ifeq ($(MICROPY_PY_THREAD),1) ifeq ($(MICROPY_PY_THREAD),1)
CFLAGS_MOD += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0 CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
LDFLAGS_MOD += $(LIBPTHREAD) LDFLAGS += $(LIBPTHREAD)
endif endif
ifeq ($(MICROPY_PY_USSL),1) ifeq ($(MICROPY_PY_USSL),1)
@ -139,7 +137,7 @@ GIT_SUBMODULES += lib/axtls
endif endif
ifeq ($(MICROPY_SSL_MBEDTLS),1) ifeq ($(MICROPY_SSL_MBEDTLS),1)
GIT_SUBMODULES += lib/mbedtls GIT_SUBMODULES += lib/mbedtls
CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"' CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
endif endif
endif endif
@ -163,8 +161,8 @@ MICROPY_BLUETOOTH_BTSTACK ?= 1
endif endif
endif endif
CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1 CFLAGS += -DMICROPY_PY_BLUETOOTH=1
CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1 CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1) ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
@ -192,7 +190,7 @@ else
# NimBLE is enabled. # NimBLE is enabled.
GIT_SUBMODULES += lib/mynewt-nimble GIT_SUBMODULES += lib/mynewt-nimble
CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1 CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
include $(TOP)/extmod/nimble/nimble.mk include $(TOP)/extmod/nimble/nimble.mk
endif endif
@ -205,31 +203,29 @@ ifeq ($(MICROPY_STANDALONE),1)
# Build libffi from source. # Build libffi from source.
GIT_SUBMODULES += lib/libffi GIT_SUBMODULES += lib/libffi
DEPLIBS += libffi DEPLIBS += libffi
LIBFFI_CFLAGS_MOD := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include) LIBFFI_CFLAGS := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
ifeq ($(MICROPY_FORCE_32BIT),1) ifeq ($(MICROPY_FORCE_32BIT),1)
LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib32/libffi.a LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib32/libffi.a
else else
LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib/libffi.a LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib/libffi.a
endif endif
else else
# Use system version of libffi. # Use system version of libffi.
LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi) LIBFFI_CFLAGS := $(shell pkg-config --cflags libffi)
LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi) LIBFFI_LDFLAGS := $(shell pkg-config --libs libffi)
endif endif
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
LIBFFI_LDFLAGS_MOD += -ldl LIBFFI_LDFLAGS += -ldl
endif endif
CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1 CFLAGS += $(LIBFFI_CFLAGS) -DMICROPY_PY_FFI=1
LDFLAGS_MOD += $(LIBFFI_LDFLAGS_MOD) LDFLAGS += $(LIBFFI_LDFLAGS)
SRC_MOD += modffi.c
endif endif
ifeq ($(MICROPY_PY_JNI),1) ifeq ($(MICROPY_PY_JNI),1)
# Path for 64-bit OpenJDK, should be adjusted for other JDKs # Path for 64-bit OpenJDK, should be adjusted for other JDKs
CFLAGS_MOD += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1 CFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
SRC_MOD += modjni.c
endif endif
# source files # source files
@ -250,6 +246,10 @@ SRC_C += \
mpbtstackport_usb.c \ mpbtstackport_usb.c \
mpnimbleport.c \ mpnimbleport.c \
$(SRC_MOD) \ $(SRC_MOD) \
modtermios.c \
modusocket.c \
modffi.c \
modjni.c \
$(wildcard $(VARIANT_DIR)/*.c) $(wildcard $(VARIANT_DIR)/*.c)
SHARED_SRC_C += $(addprefix shared/,\ SHARED_SRC_C += $(addprefix shared/,\

10
ports/unix/modjni.c
View File

@ -24,19 +24,19 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "py/runtime.h"
#include "py/binary.h"
#if MICROPY_PY_JNI
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <ctype.h> #include <ctype.h>
#include "py/runtime.h"
#include "py/binary.h"
#include <jni.h> #include <jni.h>
#if MICROPY_PY_JNI
#define JJ(call, ...) (*env)->call(env, __VA_ARGS__) #define JJ(call, ...) (*env)->call(env, __VA_ARGS__)
#define JJ1(call) (*env)->call(env) #define JJ1(call) (*env)->call(env)
#define MATCH(s, static) (!strncmp(s, static, sizeof(static) - 1)) #define MATCH(s, static) (!strncmp(s, static, sizeof(static) - 1))