kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

MacOS: Correct pkg-config name openssl for ulfius. (#10369)

Browse Source
This commit is contained in:
Austin
2026-05-01 10:42:17 -04:00
committed by GitHub
co-authored by GitHub
parent 55f40ecdfd
commit c0fcf807c0
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_macos_bin.yml
+1 -1
View File
@@ -24,7 +24,7 @@ jobs:
shell: bash shell: bash
run: | run: |
brew update brew update
brew install platformio yaml-cpp libuv openssl@3 libusb argp-standalone pkg-config brew install platformio yaml-cpp libuv openssl@3 libusb argp-standalone pkg-config ulfius
- name: Get release version string - name: Get release version string
run: | run: |
variants/native/portduino/platformio.ini
+1 -3
View File
@@ -195,14 +195,12 @@ build_flags = ${portduino_base.build_flags_common}
-DMESHTASTIC_EXCLUDE_SCREEN=1 -DMESHTASTIC_EXCLUDE_SCREEN=1
; openssl@3 is the keg-only Homebrew formula; --cflags is required so the ; 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). ; compiler finds <openssl/*.h> in the Homebrew prefix (not just the linker).
!pkg-config --cflags --libs openssl@3 --silence-errors || : !pkg-config --cflags --libs openssl --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`
; — they just don't get the HTTP API in that case. ; — they just don't get the HTTP API in that case.
!pkg-config --cflags --libs libulfius --silence-errors || : !pkg-config --cflags --libs libulfius --silence-errors || :
!pkg-config --cflags --libs liborcania --silence-errors || :
!pkg-config --cflags --libs libyder --silence-errors || :
; src/input/Linux*.{cpp,h} drive evdev (`<linux/input.h>`) which doesn't exist ; src/input/Linux*.{cpp,h} drive evdev (`<linux/input.h>`) which doesn't exist
; on macOS. graphics/Panel_sdl.* and graphics/TFTDisplay.cpp pull LovyanGFX ; on macOS. graphics/Panel_sdl.* and graphics/TFTDisplay.cpp pull LovyanGFX
; (which we lib_ignore on macOS for the <malloc.h> issue). Neither is needed ; (which we lib_ignore on macOS for the <malloc.h> issue). Neither is needed