Fix missing #includes for gcc-11

This commit is contained in:
Jeff Law 2020-10-30 14:23:23 -06:00
parent 889388c3a7
commit 3844a403b2
2 changed files with 91 additions and 2 deletions

85
oomd-gcc11.patch Normal file
View File

@ -0,0 +1,85 @@
diff --git a/src/oomd/Stats.cpp b/src/oomd/Stats.cpp
index 7c962e6..7efd605 100644
--- a/src/oomd/Stats.cpp
+++ b/src/oomd/Stats.cpp
@@ -27,6 +27,7 @@
#include <chrono>
#include <cstring>
#include <iostream>
+#include <optional>
#include "oomd/Stats.h"
#include "oomd/StatsClient.h"
diff --git a/src/oomd/StatsClient.cpp b/src/oomd/StatsClient.cpp
index ce17ecf..e0dfc41 100644
--- a/src/oomd/StatsClient.cpp
+++ b/src/oomd/StatsClient.cpp
@@ -15,6 +15,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <optional>
#include "oomd/StatsClient.h"
#include <json/reader.h>
#include <json/value.h>
diff --git a/src/oomd/StatsTest.cpp b/src/oomd/StatsTest.cpp
index db70983..09efb5b 100644
--- a/src/oomd/StatsTest.cpp
+++ b/src/oomd/StatsTest.cpp
@@ -15,6 +15,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <optional>
#include "oomd/Stats.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/src/oomd/config/JsonConfigParser.cpp b/src/oomd/config/JsonConfigParser.cpp
index 0a09d93..5b05267 100644
--- a/src/oomd/config/JsonConfigParser.cpp
+++ b/src/oomd/config/JsonConfigParser.cpp
@@ -18,6 +18,7 @@
#include "oomd/config/JsonConfigParser.h"
#include <sstream>
+#include <optional>
#include <json/reader.h>
diff --git a/src/oomd/include/CgroupPath.cpp b/src/oomd/include/CgroupPath.cpp
index a9965ed..80c9313 100644
--- a/src/oomd/include/CgroupPath.cpp
+++ b/src/oomd/include/CgroupPath.cpp
@@ -18,6 +18,7 @@
#include "oomd/include/CgroupPath.h"
#include <exception>
+#include <optional>
#include "oomd/util/Fs.h"
#include "oomd/util/Util.h"
diff --git a/src/oomd/util/Fs.cpp b/src/oomd/util/Fs.cpp
index ca0f51e..0f038f6 100644
--- a/src/oomd/util/Fs.cpp
+++ b/src/oomd/util/Fs.cpp
@@ -15,6 +15,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <optional>
+
#include "oomd/util/Fs.h"
#include <dirent.h>
diff --git a/src/oomd/util/FsTest.cpp b/src/oomd/util/FsTest.cpp
index dfc9aef..757a9e1 100644
--- a/src/oomd/util/FsTest.cpp
+++ b/src/oomd/util/FsTest.cpp
@@ -17,6 +17,7 @@
#include <utility>
#include <vector>
+#include <optional>
#include <gmock/gmock.h>
#include <gtest/gtest.h>

View File

@ -1,10 +1,11 @@
Name: oomd
Summary: Userspace Out-Of-Memory (OOM) killer
Version: 0.4.0
Release: 2%{dist}
Release: 3%{dist}
License: GPLv2
URL: https://github.com/facebookincubator/oomd/
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: %{name}-gcc11.patch
ExcludeArch: i686 armv7hl
@ -36,7 +37,7 @@ of flexibility where each workload can have custom protection rules.
Furthermore, time spent livedlocked in kernelspace is minimized.
%prep
%autosetup
%autosetup -p1
%build
%meson
@ -66,6 +67,9 @@ Furthermore, time spent livedlocked in kernelspace is minimized.
%systemd_postun_with_restart oomd.service
%changelog
* Fri Oct 30 2020 Jeff Law <law@redhat.com> - 0.4.0-3
- Fix missing #includes for gcc-11
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild