1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From 744cea05539ed0a54150e46feefeaa1fd4c350ac Mon Sep 17 00:00:00 2001
From: yangfl <yangfl@users.noreply.github.com>
Date: Tue, 8 Aug 2023 04:23:14 +0800
Subject: [PATCH 1/8] unix: Fix Makefile
---
ports/unix/Makefile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 4e9a3736a..790aa501a 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -47,6 +47,9 @@ INC += -I$(BUILD)
CWARN = -Wall -Werror
CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
+ifdef MP_CONFIGFILE
+CFLAGS += -DMP_CONFIGFILE="$(MP_CONFIGFILE)"
+endif
# Force the use of 64-bits for file sizes in C library functions on 32-bit platforms.
# This option has no effect on 64-bit builds.
@@ -192,7 +195,7 @@ endif
ifeq ($(MICROPY_PY_JNI),1)
# Path for 64-bit OpenJDK, should be adjusted for other JDKs
-CFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
+CFLAGS += -I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux -DMICROPY_PY_JNI=1
endif
# source files
@@ -258,7 +261,7 @@ include $(TOP)/py/mkrules.mk
test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
$(eval DIRNAME=ports/$(notdir $(CURDIR)))
- cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
+ cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py $(TESTS_ARGS)
test_full_no_native: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
$(eval DIRNAME=ports/$(notdir $(CURDIR)))
--
2.51.0
|
