From 6e83a9a0b35d6d93dfc99cddb2b3ea3ad400a550 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sun, 21 Dec 2025 19:39:44 -0600 Subject: [PATCH] unbreak all the targets --- platformio.ini | 2 +- src/modules/Native/StoreForwardPlusPlus.cpp | 4 +++- variants/native/portduino/platformio.ini | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index 4fa7acd66..cb8da746f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -94,7 +94,7 @@ lib_deps = # renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL end2endzone/NonBlockingRTTTL@1.4.0 build_flags = ${env.build_flags} -Os -build_src_filter = ${env.build_src_filter} - - +build_src_filter = ${env.build_src_filter} - - - ; Common libs for communicating over TCP/IP networks such as MQTT [networking_base] diff --git a/src/modules/Native/StoreForwardPlusPlus.cpp b/src/modules/Native/StoreForwardPlusPlus.cpp index dfd33d6c2..bd97c8ad0 100644 --- a/src/modules/Native/StoreForwardPlusPlus.cpp +++ b/src/modules/Native/StoreForwardPlusPlus.cpp @@ -12,6 +12,7 @@ // TODO: evict messages from scratch after a timeout // things may get weird if there are multiple stratum-0 nodes on a single mesh. Come up with mitigations +#if __has_include("sqlite3.h") #include "StoreForwardPlusPlus.h" #include "MeshService.h" @@ -1068,4 +1069,5 @@ uint32_t StoreForwardPlusPlusModule::getChainCount(uint8_t *root_hash, size_t ro uint32_t count = sqlite3_column_int(getChainCountStmt, 0); sqlite3_reset(getChainCountStmt); return count; -} \ No newline at end of file +} +#endif // has include sqlite3 \ No newline at end of file diff --git a/variants/native/portduino/platformio.ini b/variants/native/portduino/platformio.ini index 4aef42544..decc45911 100644 --- a/variants/native/portduino/platformio.ini +++ b/variants/native/portduino/platformio.ini @@ -9,7 +9,7 @@ lib_deps = # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028 melopero/Melopero RV3028@1.2.0 -build_src_filter = ${portduino_base.build_src_filter} +build_src_filter = ${portduino_base.build_src_filter} + [env:native] extends = native_base @@ -20,6 +20,7 @@ build_flags = ${native_base.build_flags} !pkg-config --libs openssl --silence-errors || : !pkg-config --cflags --libs sdl2 --silence-errors || : !pkg-config --cflags --libs libbsd-overlay --silence-errors || : + !pkg-config --cflags --libs sqlite3 --silence-errors || : [env:native-tft] extends = native_base @@ -76,6 +77,7 @@ build_flags = ${native_base.build_flags} -Os -ffunction-sections -fdata-sections !pkg-config --libs libulfius --silence-errors || : !pkg-config --libs openssl --silence-errors || : !pkg-config --cflags --libs libbsd-overlay --silence-errors || : + !pkg-config --cflags --libs sqlite3 --silence-errors || : build_src_filter = ${native_base.build_src_filter} @@ -109,6 +111,7 @@ build_flags = ${native_base.build_flags} -O0 -fsanitize=address -lX11 -linput -l !pkg-config --libs libulfius --silence-errors || : !pkg-config --libs openssl --silence-errors || : !pkg-config --cflags --libs libbsd-overlay --silence-errors || : + !pkg-config --cflags --libs sqlite3 --silence-errors || : build_src_filter = ${env:native-tft.build_src_filter} [env:coverage]