From ac9c608542829974e09b6766583f84811955bae8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 Jun 2025 18:13:07 +0200
Subject: [PATCH 1/2] Bump esptool from 4.8.1 to 4.9.0 (#9158)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 76a58bf622..4932fb48f5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ tzlocal==5.3.1    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
 platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
-esptool==4.8.1
+esptool==4.9.0
 click==8.1.7
 esphome-dashboard==20250514.0
 aioesphomeapi==32.2.4

From c81dbf9d59b8b5a04cf76d4cdd2b01c207c75387 Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Sun, 22 Jun 2025 12:09:38 +0200
Subject: [PATCH 2/2] Improve on C++17 (#9170)

---
 esphome/components/host/__init__.py | 2 +-
 esphome/cpp_generator.py            | 6 ++++++
 platformio.ini                      | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/esphome/components/host/__init__.py b/esphome/components/host/__init__.py
index e275adafa9..b59d8ebd03 100644
--- a/esphome/components/host/__init__.py
+++ b/esphome/components/host/__init__.py
@@ -41,6 +41,6 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
     cg.add_build_flag("-DUSE_HOST")
     cg.add_define("USE_ESPHOME_HOST_MAC_ADDRESS", config[CONF_MAC_ADDRESS].parts)
-    cg.add_build_flag("-std=c++17")
+    cg.add_build_flag("-std=gnu++17")
     cg.add_define("ESPHOME_BOARD", "host")
     cg.add_platformio_option("platform", "platformio/native")
diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index 4641f69bdd..2a7b7fe057 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -616,6 +616,12 @@ def add_build_unflag(build_unflag: str) -> None:
 def set_cpp_standard(standard: str) -> None:
     """Set C++ standard with compiler flag `-std={standard}`."""
     CORE.add_build_unflag("-std=gnu++11")
+    CORE.add_build_unflag("-std=gnu++14")
+    CORE.add_build_unflag("-std=gnu++20")
+    CORE.add_build_unflag("-std=gnu++23")
+    CORE.add_build_unflag("-std=gnu++2a")
+    CORE.add_build_unflag("-std=gnu++2b")
+    CORE.add_build_unflag("-std=gnu++2c")
     CORE.add_build_flag(f"-std={standard}")
 
 
diff --git a/platformio.ini b/platformio.ini
index f67226d657..6da9fc1338 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -50,6 +50,12 @@ build_flags =
     -std=gnu++17
 build_unflags =
     -std=gnu++11
+    -std=gnu++14
+    -std=gnu++20
+    -std=gnu++23
+    -std=gnu++2a
+    -std=gnu++2b
+    -std=gnu++2c
 src_filter =
     +<./>
     +<../tests/dummy_main.cpp>