From e4c66990e27779f43f4901d431b6c61f8da85f51 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Fri, 20 Nov 2020 23:33:39 -0500
Subject: compiles

---
 py/circuitpy_defns.mk | 11 +++++------
 py/enum.h             |  4 ++--
 py/genlast.py         |  4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'py')

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index dbde1a34d..d788a5411 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -359,8 +359,6 @@ SRC_COMMON_HAL_ALL = \
 	rtc/__init__.c \
 	sdioio/SDCard.c \
 	sdioio/__init__.c \
-	sleepio/__init__.c \
-	sleepio/ResetReason.c \
 	socketpool/__init__.c \
 	socketpool/SocketPool.c \
 	socketpool/Socket.c \
@@ -395,9 +393,10 @@ $(filter $(SRC_PATTERNS), \
 	_bleio/Address.c \
 	_bleio/Attribute.c \
 	_bleio/ScanEntry.c \
-	canio/Match.c \
 	_eve/__init__.c \
+	alarm/ResetReason.c \
 	camera/ImageFormat.c \
+	canio/Match.c \
 	digitalio/Direction.c \
 	digitalio/DriveMode.c \
 	digitalio/Pull.c \
@@ -414,9 +413,6 @@ SRC_SHARED_MODULE_ALL = \
 	_bleio/Attribute.c \
 	_bleio/ScanEntry.c \
 	_bleio/ScanResults.c \
-	canio/Match.c \
-	canio/Message.c \
-	canio/RemoteTransmissionRequest.c \
 	_eve/__init__.c \
 	_pixelbuf/PixelBuf.c \
 	_pixelbuf/__init__.c \
@@ -441,6 +437,9 @@ SRC_SHARED_MODULE_ALL = \
 	bitbangio/__init__.c \
 	board/__init__.c \
 	busio/OneWire.c \
+	canio/Match.c \
+	canio/Message.c \
+	canio/RemoteTransmissionRequest.c \
 	displayio/Bitmap.c \
 	displayio/ColorConverter.c \
 	displayio/Display.c \
diff --git a/py/enum.h b/py/enum.h
index 1c38ae5ae..708678eb6 100644
--- a/py/enum.h
+++ b/py/enum.h
@@ -35,12 +35,12 @@ typedef struct {
 } cp_enum_obj_t;
 
 #define MAKE_ENUM_VALUE(type, prefix, name, value) \
-    STATIC const cp_enum_obj_t prefix ## _ ## name ## _obj = { \
+    const cp_enum_obj_t prefix ## _ ## name ## _obj = {  \
         { &type }, value, MP_QSTR_ ## name, \
     }
 
 #define MAKE_ENUM_MAP(name) \
-    STATIC const mp_rom_map_elem_t name ## _locals_table[] =
+    const mp_rom_map_elem_t name ## _locals_table[] =
 
 #define MAKE_ENUM_MAP_ENTRY(prefix, name) \
     { MP_ROM_QSTR(MP_QSTR_ ## name), MP_ROM_PTR(&prefix ## _ ## name ## _obj) }
diff --git a/py/genlast.py b/py/genlast.py
index 1df2a2482..5b195d23e 100644
--- a/py/genlast.py
+++ b/py/genlast.py
@@ -47,7 +47,9 @@ def preprocess(command, output_dir, fn):
         print(e, file=sys.stderr)
 
 def maybe_preprocess(command, output_dir, fn):
-    if subprocess.call(["grep", "-lqE", "(MP_QSTR|translate)", fn]) == 0:
+    # Preprocess the source file if it contains "MP_QSTR", "translate",
+    # or if it uses enum.h (which generates "MP_QSTR" strings.
+    if subprocess.call(["grep", "-lqE", r"(MP_QSTR|translate|enum\.h)", fn]) == 0:
         preprocess(command, output_dir, fn)
 
 if __name__ == '__main__':
-- 
cgit v1.2.3