Merge pull request #2262 from GUVWAF/tryFixPortduino

Next try fix Portduino
This commit is contained in:
Ben Meadors 2023-02-07 13:52:39 -06:00 committed by GitHub
commit 3209aeabb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions

View File

@ -18,4 +18,4 @@ lib_deps =
${env.lib_deps} ${env.lib_deps}
${networking_base.lib_deps} ${networking_base.lib_deps}
rweather/Crypto@^0.4.0 rweather/Crypto@^0.4.0
build_flags = ${arduino_base.build_flags} -Isrc/platform/portduino build_flags = ${arduino_base.build_flags} -fPIC -Isrc/platform/portduino

View File

@ -117,7 +117,6 @@
#endif // HAS_WIFI #endif // HAS_WIFI
#if HAS_WIFI || HAS_ETHERNET #if HAS_WIFI || HAS_ETHERNET
#include <Syslog.h>
class Syslog class Syslog
{ {

View File

@ -1,6 +1,6 @@
[env:native] [env:native]
extends = portduino_base extends = portduino_base
build_flags = ${portduino_base.build_flags} -fPIE -O0 -I variants/portduino build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
board = cross_platform board = cross_platform
lib_deps = ${portduino_base.lib_deps} lib_deps = ${portduino_base.lib_deps}
build_src_filter = ${portduino_base.build_src_filter} build_src_filter = ${portduino_base.build_src_filter}
@ -8,7 +8,7 @@ build_src_filter = ${portduino_base.build_src_filter}
; The Portduino based sim environment on top of a linux OS and touching linux hardware devices ; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
[env:linux] [env:linux]
extends = portduino_base extends = portduino_base
build_flags = ${portduino_base.build_flags} -fPIE -O0 -lgpiod -I variants/portduino build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
board = linux_hardware board = linux_hardware
lib_deps = ${portduino_base.lib_deps} lib_deps = ${portduino_base.lib_deps}
build_src_filter = ${portduino_base.build_src_filter} build_src_filter = ${portduino_base.build_src_filter}
@ -16,7 +16,7 @@ build_src_filter = ${portduino_base.build_src_filter}
; The Portduino based sim environment on top of a linux OS and touching linux hardware devices ; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
[env:linux-arm] [env:linux-arm]
extends = portduino_base extends = portduino_base
build_flags = ${portduino_base.build_flags} -fPIE -O0 -lgpiod -I variants/portduino build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
board = linux_arm board = linux_arm
lib_deps = ${portduino_base.lib_deps} lib_deps = ${portduino_base.lib_deps}
build_src_filter = ${portduino_base.build_src_filter} build_src_filter = ${portduino_base.build_src_filter}