From 93f87c57b9bea1e509acfd547668722b51291de9 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Tue, 9 Jun 2026 21:00:05 -0500 Subject: [PATCH] MacOS fixes --- src/mqtt/ServiceEnvelope.h | 3 ++- test/test_http_content_handler/test_main.cpp | 1 + test/test_traffic_management/test_main.cpp | 1 + variants/native/portduino.ini | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mqtt/ServiceEnvelope.h b/src/mqtt/ServiceEnvelope.h index 6ab0695db..0dd492dc4 100644 --- a/src/mqtt/ServiceEnvelope.h +++ b/src/mqtt/ServiceEnvelope.h @@ -5,7 +5,8 @@ // meshtastic_ServiceEnvelope that automatically releases dynamically allocated memory when it goes out of scope. struct DecodedServiceEnvelope : public meshtastic_ServiceEnvelope { DecodedServiceEnvelope(const uint8_t *payload, size_t length); - DecodedServiceEnvelope(DecodedServiceEnvelope &) = delete; + // const-qualified so std::variant instantiation works on Apple libc++ (copying stays ill-formed either way) + DecodedServiceEnvelope(const DecodedServiceEnvelope &) = delete; DecodedServiceEnvelope(DecodedServiceEnvelope &&); ~DecodedServiceEnvelope(); // Clients must check that this is true before using. diff --git a/test/test_http_content_handler/test_main.cpp b/test/test_http_content_handler/test_main.cpp index af0a41cef..3b628a2b2 100644 --- a/test/test_http_content_handler/test_main.cpp +++ b/test/test_http_content_handler/test_main.cpp @@ -1,4 +1,5 @@ #include "TestUtil.h" +#include #include static void test_placeholder() diff --git a/test/test_traffic_management/test_main.cpp b/test/test_traffic_management/test_main.cpp index 734b4a970..7631999b3 100644 --- a/test/test_traffic_management/test_main.cpp +++ b/test/test_traffic_management/test_main.cpp @@ -1,4 +1,5 @@ #include "TestUtil.h" +#include #include #if defined(ARCH_PORTDUINO) diff --git a/variants/native/portduino.ini b/variants/native/portduino.ini index 0d0285768..978b1fdd6 100644 --- a/variants/native/portduino.ini +++ b/variants/native/portduino.ini @@ -55,7 +55,6 @@ build_flags_common = -lyaml-cpp -ljsoncpp !pkg-config --cflags jsoncpp --silence-errors || : - -li2c -luv -std=gnu17 -std=gnu++17