diff --git a/src/mesh/raspihttp/PiWebServer.cpp b/src/mesh/raspihttp/PiWebServer.cpp index 694213078..5485f8eb2 100644 --- a/src/mesh/raspihttp/PiWebServer.cpp +++ b/src/mesh/raspihttp/PiWebServer.cpp @@ -14,7 +14,7 @@ Linux (apt): 1.) Add these libs to the compile and target machine: sudo apt update && \ - apt -y install openssl libssl-dev libopenssl libsdl2-dev \ + apt -y install openssl libssl-dev libsdl2-dev \ libulfius-dev liborcania-dev macOS (Homebrew): @@ -23,7 +23,7 @@ macOS (Homebrew): brew install ulfius openssl@3 The PlatformIO env (native-macos) picks up compiler/linker flags via - `pkg-config`. In particular, OpenSSL needs `pkg-config --cflags --libs openssl` + `pkg-config`. In particular, OpenSSL needs `pkg-config --cflags --libs openssl@3` so both the Homebrew include path and linker flags are provided; ulfius and its dependencies (liborcania, libyder) are also resolved via `pkg-config`. diff --git a/variants/native/portduino/platformio.ini b/variants/native/portduino/platformio.ini index 93dea2ca8..0a47e7283 100644 --- a/variants/native/portduino/platformio.ini +++ b/variants/native/portduino/platformio.ini @@ -193,7 +193,9 @@ build_flags = ${portduino_base.build_flags_common} ; style screen-driver hooks scattered through sensor sources. -DHAS_SCREEN=0 -DMESHTASTIC_EXCLUDE_SCREEN=1 - !pkg-config --libs openssl --silence-errors || : + ; openssl@3 is the keg-only Homebrew formula; --cflags is required so the + ; compiler finds in the Homebrew prefix (not just the linker). + !pkg-config --cflags --libs openssl@3 --silence-errors || : ; PiWebServer (src/mesh/raspihttp/PiWebServer.cpp) auto-engages when ulfius ; headers are reachable via `#if __has_include()`. The `|| :` ; tail keeps the build green when the user hasn't run `brew install ulfius`