From 730564038efde934b65237475564c0fbb9712700 Mon Sep 17 00:00:00 2001
From: Jason Shuler <jshuler@gmail.com>
Date: Wed, 17 Nov 2021 11:06:00 -0500
Subject: [PATCH 1/2] Fix compile on Ubuntu 21.10

---
 SConstruct | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SConstruct b/SConstruct
index 73c66690ade338..67acd3eac4637f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -189,6 +189,7 @@ env = Environment(
     "-Wno-inconsistent-missing-override",
     "-Wno-c99-designator",
     "-Wno-reorder-init-list",
+    "-Wno-error=unused-but-set-variable",
   ] + cflags + ccflags,
 
   CPPPATH=cpppath + [

From 5e58038ab83026c4e7b9d33e40de3375350142f6 Mon Sep 17 00:00:00 2001
From: Jason Shuler <jshuler@gmail.com>
Date: Wed, 17 Nov 2021 11:49:24 -0500
Subject: [PATCH 2/2] Add missing c++17 optional refs in ui

---
 selfdrive/ui/navd/route_engine.h | 2 ++
 selfdrive/ui/ui.h                | 1 +
 2 files changed, 3 insertions(+)

diff --git a/selfdrive/ui/navd/route_engine.h b/selfdrive/ui/navd/route_engine.h
index 5b8de698a96bb3..9a6c99041732aa 100644
--- a/selfdrive/ui/navd/route_engine.h
+++ b/selfdrive/ui/navd/route_engine.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <optional>
+
 #include <QThread>
 #include <QGeoCoordinate>
 #include <QGeoManeuver>
diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h
index ad754b550b995a..46cbae63fb035d 100644
--- a/selfdrive/ui/ui.h
+++ b/selfdrive/ui/ui.h
@@ -3,6 +3,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <optional>
 
 #include <QObject>
 #include <QTimer>