From 09ad54970c1430ea27d12cfb6a401055907aed4f Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Wed, 17 Nov 2021 13:46:38 -0800
Subject: [PATCH] Revert "Revert "Fix build failures in Ubuntu 21.10 (#22952)""

This reverts commit caf0013a20b5330b4b964867adf40294bc407e43.

old-commit-hash: f2a81309e10a93b85d4d68a83392eab9d8df9155
---
 SConstruct                       | 1 +
 selfdrive/ui/navd/route_engine.h | 2 ++
 selfdrive/ui/ui.h                | 1 +
 3 files changed, 4 insertions(+)

diff --git a/SConstruct b/SConstruct
index 73c66690ad..67acd3eac4 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 + [
diff --git a/selfdrive/ui/navd/route_engine.h b/selfdrive/ui/navd/route_engine.h
index 5b8de698a9..9a6c990417 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 ad754b550b..46cbae63fb 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>