ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-22 11:17:49 +10:00
Code Releases Activity

fix: add --cflags to openssl@3 pkg-config and fix apt package name

Browse Source 
Agent-Logs-Url: https://github.com/meshtastic/firmware/sessions/1a6c59aa-4393-4134-8cee-61eeee0e9127

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-05-01 13:35:22 +00:00
committed by GitHub
co-authored by thebentern
parent 8de700714f
commit d50d260b5a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesh/raspihttp/PiWebServer.cpp
+2 -2
View File
@@ -14,7 +14,7 @@ Linux (apt):
1.) Add these libs to the compile and target machine: 1.) Add these libs to the compile and target machine:
sudo apt update && \ sudo apt update && \
apt -y install openssl libssl-dev libopenssl libsdl2-dev \ apt -y install openssl libssl-dev libsdl2-dev \
libulfius-dev liborcania-dev libulfius-dev liborcania-dev
macOS (Homebrew): macOS (Homebrew):
@@ -23,7 +23,7 @@ macOS (Homebrew):
brew install ulfius openssl@3 brew install ulfius openssl@3
The PlatformIO env (native-macos) picks up compiler/linker flags via 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 so both the Homebrew include path and linker flags are provided; ulfius and its
dependencies (liborcania, libyder) are also resolved via `pkg-config`. dependencies (liborcania, libyder) are also resolved via `pkg-config`.
variants/native/portduino/platformio.ini
+3 -1
View File
@@ -193,7 +193,9 @@ build_flags = ${portduino_base.build_flags_common}
; style screen-driver hooks scattered through sensor sources. ; style screen-driver hooks scattered through sensor sources.
-DHAS_SCREEN=0 -DHAS_SCREEN=0
-DMESHTASTIC_EXCLUDE_SCREEN=1 -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 <openssl/*.h> 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 ; PiWebServer (src/mesh/raspihttp/PiWebServer.cpp) auto-engages when ulfius
; headers are reachable via `#if __has_include(<ulfius.h>)`. The `|| :` ; headers are reachable via `#if __has_include(<ulfius.h>)`. The `|| :`
; tail keeps the build green when the user hasn't run `brew install ulfius` ; tail keeps the build green when the user hasn't run `brew install ulfius`