From 4a0c341438efb0b49bd09c29b710ac31038ec3b6 Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Tue, 7 Feb 2023 19:40:15 +0100 Subject: [PATCH 1/3] Make Portduino build again --- src/DebugConfiguration.h | 1 - variants/portduino/platformio.ini | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/DebugConfiguration.h b/src/DebugConfiguration.h index 303e26899..36b009ff2 100644 --- a/src/DebugConfiguration.h +++ b/src/DebugConfiguration.h @@ -117,7 +117,6 @@ #endif // HAS_WIFI #if HAS_WIFI || HAS_ETHERNET -#include class Syslog { diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini index b79a97d20..e3845132b 100644 --- a/variants/portduino/platformio.ini +++ b/variants/portduino/platformio.ini @@ -1,6 +1,6 @@ [env:native] extends = portduino_base -build_flags = ${portduino_base.build_flags} -fPIE -O0 -I variants/portduino +build_flags = ${portduino_base.build_flags} -fPIC -O0 -I variants/portduino board = cross_platform lib_deps = ${portduino_base.lib_deps} 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 [env:linux] extends = portduino_base -build_flags = ${portduino_base.build_flags} -fPIE -O0 -lgpiod -I variants/portduino +build_flags = ${portduino_base.build_flags} -fPIC -O0 -lgpiod -I variants/portduino board = linux_hardware lib_deps = ${portduino_base.lib_deps} 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 [env:linux-arm] extends = portduino_base -build_flags = ${portduino_base.build_flags} -fPIE -O0 -lgpiod -I variants/portduino +build_flags = ${portduino_base.build_flags} -fPIC -O0 -lgpiod -I variants/portduino board = linux_arm lib_deps = ${portduino_base.lib_deps} build_src_filter = ${portduino_base.build_src_filter} From a5b99ee5d57e77b478b6e46c8a38d42f886fda74 Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Tue, 7 Feb 2023 20:05:40 +0100 Subject: [PATCH 2/3] Try other location --- arch/portduino/portduino.ini | 2 +- variants/portduino/platformio.ini | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index cd962b671..b44664f93 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -18,4 +18,4 @@ lib_deps = ${env.lib_deps} ${networking_base.lib_deps} rweather/Crypto@^0.4.0 -build_flags = ${arduino_base.build_flags} -Isrc/platform/portduino +build_flags = ${arduino_base.build_flags} -fPIE -Isrc/platform/portduino diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini index e3845132b..5bbde2adf 100644 --- a/variants/portduino/platformio.ini +++ b/variants/portduino/platformio.ini @@ -1,6 +1,6 @@ [env:native] extends = portduino_base -build_flags = ${portduino_base.build_flags} -fPIC -O0 -I variants/portduino +build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino board = cross_platform lib_deps = ${portduino_base.lib_deps} 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 [env:linux] extends = portduino_base -build_flags = ${portduino_base.build_flags} -fPIC -O0 -lgpiod -I variants/portduino +build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino board = linux_hardware lib_deps = ${portduino_base.lib_deps} 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 [env:linux-arm] extends = portduino_base -build_flags = ${portduino_base.build_flags} -fPIC -O0 -lgpiod -I variants/portduino +build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino board = linux_arm lib_deps = ${portduino_base.lib_deps} build_src_filter = ${portduino_base.build_src_filter} From 42b496b0db2972661c623ee445ce00af9d055956 Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Tue, 7 Feb 2023 20:12:12 +0100 Subject: [PATCH 3/3] PIC --- arch/portduino/portduino.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index b44664f93..b6b17d391 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -18,4 +18,4 @@ lib_deps = ${env.lib_deps} ${networking_base.lib_deps} rweather/Crypto@^0.4.0 -build_flags = ${arduino_base.build_flags} -fPIE -Isrc/platform/portduino +build_flags = ${arduino_base.build_flags} -fPIC -Isrc/platform/portduino