From a147e44bbe7fffb8d44ea13ba04f0b12b70d69c1 Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <maximilian.gerhardt@rub.de>
Date: Tue, 22 Mar 2022 11:55:46 +0100
Subject: [PATCH 1/8] Hotfix linking failure for paths containing spaces
---
tools/platformio-build-esp32.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/platformio-build-esp32.py b/tools/platformio-build-esp32.py
index 1c27d0ce87c..4b575cfbb1a 100644
--- a/tools/platformio-build-esp32.py
+++ b/tools/platformio-build-esp32.py
@@ -24,7 +24,7 @@
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-from os.path import abspath, isdir, isfile, join, basename
+from os.path import abspath, isdir, isfile, join, basename, relpath
from SCons.Script import DefaultEnvironment
@@ -112,7 +112,7 @@
"-u", "newlib_include_pthread_impl",
"-u", "newlib_include_assert_impl",
"-u", "__cxa_guard_dummy",
- '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+ '-Wl,-Map="%s"' % relpath(join(env.subst("$PROJECT_BUILD_DIR"), env.subst("$PIOENV") , basename(env.subst("${PROJECT_DIR}.map")))).replace(" ", "_")
],
CPPPATH=[
From ef9997ae9a9538e32d3713ba9de13bb8101a89a8 Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <maximilian.gerhardt@rub.de>
Date: Tue, 22 Mar 2022 12:05:23 +0100
Subject: [PATCH 2/8] Hotfix linking failure for paths containing spaces
(esp32c3)
---
tools/platformio-build-esp32c3.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/platformio-build-esp32c3.py b/tools/platformio-build-esp32c3.py
index 2deb4700ae3..aed63ed8fc3 100644
--- a/tools/platformio-build-esp32c3.py
+++ b/tools/platformio-build-esp32c3.py
@@ -24,7 +24,7 @@
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-from os.path import abspath, isdir, isfile, join, basename
+from os.path import abspath, isdir, isfile, join, basename, relpath
from SCons.Script import DefaultEnvironment
@@ -138,7 +138,7 @@
"-u", "newlib_include_assert_impl",
"-u", "__cxa_guard_dummy",
"-u", "__cxx_fatal_exception",
- '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+ '-Wl,-Map="%s"' % relpath(join(env.subst("$PROJECT_BUILD_DIR"), env.subst("$PIOENV") , basename(env.subst("${PROJECT_DIR}.map")))).replace(" ", "_")
],
CPPPATH=[
From 06084b427f298658eed12bf32a901f3570373d98 Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <maximilian.gerhardt@rub.de>
Date: Tue, 22 Mar 2022 12:06:02 +0100
Subject: [PATCH 3/8] Hotfix linking failure for paths containing spaces
(ESP32S2)
---
tools/platformio-build-esp32s2.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/platformio-build-esp32s2.py b/tools/platformio-build-esp32s2.py
index 6de57f568e1..29d0df8a034 100644
--- a/tools/platformio-build-esp32s2.py
+++ b/tools/platformio-build-esp32s2.py
@@ -24,7 +24,7 @@
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-from os.path import abspath, isdir, isfile, join, basename
+from os.path import abspath, isdir, isfile, join, basename, relpath
from SCons.Script import DefaultEnvironment
@@ -107,7 +107,7 @@
"-u", "newlib_include_pthread_impl",
"-u", "newlib_include_assert_impl",
"-u", "__cxa_guard_dummy",
- '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+ '-Wl,-Map="%s"' % relpath(join(env.subst("$PROJECT_BUILD_DIR"), env.subst("$PIOENV") , basename(env.subst("${PROJECT_DIR}.map")))).replace(" ", "_")
],
CPPPATH=[
From 77bfefd69c0ae7e461f74f5e6f2b176be1f5714e Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <maximilian.gerhardt@rub.de>
Date: Wed, 23 Mar 2022 21:08:06 +0100
Subject: [PATCH 4/8] Use alternative path and escaping method
---
tools/platformio-build-esp32.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/platformio-build-esp32.py b/tools/platformio-build-esp32.py
index 4b575cfbb1a..e2a24083021 100644
--- a/tools/platformio-build-esp32.py
+++ b/tools/platformio-build-esp32.py
@@ -24,7 +24,7 @@
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-from os.path import abspath, isdir, isfile, join, basename, relpath
+from os.path import abspath, isdir, isfile, join, basename
from SCons.Script import DefaultEnvironment
@@ -112,7 +112,7 @@
"-u", "newlib_include_pthread_impl",
"-u", "newlib_include_assert_impl",
"-u", "__cxa_guard_dummy",
- '-Wl,-Map="%s"' % relpath(join(env.subst("$PROJECT_BUILD_DIR"), env.subst("$PIOENV") , basename(env.subst("${PROJECT_DIR}.map")))).replace(" ", "_")
+ '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
],
CPPPATH=[
From e57febea4d0973635c942326212a3503bfca6cfa Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <maximilian.gerhardt@rub.de>
Date: Wed, 23 Mar 2022 21:09:05 +0100
Subject: [PATCH 5/8] Use alternative path and escaping method
---
tools/platformio-build-esp32c3.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/platformio-build-esp32c3.py b/tools/platformio-build-esp32c3.py
index aed63ed8fc3..6d9ada69ffa 100644
--- a/tools/platformio-build-esp32c3.py
+++ b/tools/platformio-build-esp32c3.py
@@ -24,7 +24,7 @@
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-from os.path import abspath, isdir, isfile, join, basename, relpath
+from os.path import abspath, isdir, isfile, join, basename
from SCons.Script import DefaultEnvironment
@@ -138,7 +138,7 @@
"-u", "newlib_include_assert_impl",
"-u", "__cxa_guard_dummy",
"-u", "__cxx_fatal_exception",
- '-Wl,-Map="%s"' % relpath(join(env.subst("$PROJECT_BUILD_DIR"), env.subst("$PIOENV") , basename(env.subst("${PROJECT_DIR}.map")))).replace(" ", "_")
+ '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
],
CPPPATH=[
From f58545270e645559661a6b8b5afdd1add817da7f Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <maximilian.gerhardt@rub.de>
Date: Wed, 23 Mar 2022 21:09:36 +0100
Subject: [PATCH 6/8] Use alternative path and escaping method
---
tools/platformio-build-esp32s2.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/platformio-build-esp32s2.py b/tools/platformio-build-esp32s2.py
index 29d0df8a034..4fa0817b5dd 100644
--- a/tools/platformio-build-esp32s2.py
+++ b/tools/platformio-build-esp32s2.py
@@ -24,7 +24,7 @@
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-from os.path import abspath, isdir, isfile, join, basename, relpath
+from os.path import abspath, isdir, isfile, join, basename
from SCons.Script import DefaultEnvironment
@@ -107,7 +107,7 @@
"-u", "newlib_include_pthread_impl",
"-u", "newlib_include_assert_impl",
"-u", "__cxa_guard_dummy",
- '-Wl,-Map="%s"' % relpath(join(env.subst("$PROJECT_BUILD_DIR"), env.subst("$PIOENV") , basename(env.subst("${PROJECT_DIR}.map")))).replace(" ", "_")
+ '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
],
CPPPATH=[
From bad1c4ea12226fb402e569c01a8dc38120989282 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Mon, 28 Mar 2022 13:48:43 +0300
Subject: [PATCH 7/8] Update platformio-build-esp32c3.py
---
tools/platformio-build-esp32c3.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/platformio-build-esp32c3.py b/tools/platformio-build-esp32c3.py
index c9885d13390..d798838d72f 100644
--- a/tools/platformio-build-esp32c3.py
+++ b/tools/platformio-build-esp32c3.py
@@ -111,8 +111,7 @@
"-u", "newlib_include_pthread_impl",
"-u", "newlib_include_assert_impl",
"-u", "__cxa_guard_dummy",
- "-u", "__cxx_fatal_exception",
- '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+ '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
],
CPPPATH=[
From c686b66a1358ad1988c3bbddb6f26d20c0df8e1e Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Mon, 28 Mar 2022 13:50:20 +0300
Subject: [PATCH 8/8] add esp32s3 changes
---
tools/platformio-build-esp32s3.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/platformio-build-esp32s3.py b/tools/platformio-build-esp32s3.py
index 49dbb1131a3..4762af61e8c 100644
--- a/tools/platformio-build-esp32s3.py
+++ b/tools/platformio-build-esp32s3.py
@@ -108,7 +108,7 @@
"-u", "newlib_include_pthread_impl",
"-u", "newlib_include_assert_impl",
"-u", "__cxa_guard_dummy",
- '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+ '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
],
CPPPATH=[