From 15670b7a478f9dbf8f8cb3c153e5ebf43615a958 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 9 Aug 2022 15:33:23 -0500 Subject: [PATCH] Backport upstream commit to add a missing include --- ...742f08349fbc93f459228dcc3d1f56eac411.patch | 41 +++++++++++++++++++ oomd.spec | 8 +++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 83a6742f08349fbc93f459228dcc3d1f56eac411.patch diff --git a/83a6742f08349fbc93f459228dcc3d1f56eac411.patch b/83a6742f08349fbc93f459228dcc3d1f56eac411.patch new file mode 100644 index 0000000..56a8e89 --- /dev/null +++ b/83a6742f08349fbc93f459228dcc3d1f56eac411.patch @@ -0,0 +1,41 @@ +From 83a6742f08349fbc93f459228dcc3d1f56eac411 Mon Sep 17 00:00:00 2001 +From: ycitgez +Date: Tue, 12 Jul 2022 13:20:32 -0700 +Subject: [PATCH] Resolved a compiler error due to lacking include (#162) + +Summary: +Fixed an issue where a missing include causing compiler errors + +Also applied clang-format.sh + +Issue occured with following compiler and linker: +``` +C++ compiler for the host machine: ccache c++ (gcc 12.1.1 "c++ (GCC) 12.1.1 20220507 (Red Hat 12.1.1-1)") +C++ linker for the host machine: c++ ld.bfd 2.37-27 +``` + +Pull Request resolved: https://github.com/facebookincubator/oomd/pull/162 + +Reviewed By: brianc118 + +Differential Revision: D37790605 + +Pulled By: lnyng + +fbshipit-source-id: d42776978b4bc8f7e2f584fde109e6cc3f5bc7d6 +--- + src/oomd/Log.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/oomd/Log.h b/src/oomd/Log.h +index 3d2d6ea..0ed5f73 100644 +--- a/src/oomd/Log.h ++++ b/src/oomd/Log.h +@@ -18,6 +18,7 @@ + #pragma once + + #include ++#include + #include + #include + #include diff --git a/oomd.spec b/oomd.spec index 7a4bf52..678420f 100644 --- a/oomd.spec +++ b/oomd.spec @@ -3,7 +3,7 @@ Name: oomd Summary: Userspace Out-Of-Memory (OOM) killer Version: 0.5.0 -Release: 5%{dist} +Release: 6%{dist} License: GPLv2 URL: https://github.com/facebookincubator/oomd/ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -11,6 +11,8 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: %{url}/commit/076af42b270388f38055fdf60dccbb3001de723a.patch # Fix ODR violation in tests Patch1: %{url}/commit/3989e169fc0da9c29da8dd692427d4f4c1ace413.patch +# Resolved a compiler error due to lacking include +Patch2: %{url}/commit/83a6742f08349fbc93f459228dcc3d1f56eac411.patch ExcludeArch: i686 armv7hl @@ -77,6 +79,10 @@ Furthermore, time spent livedlocked in kernelspace is minimized. %systemd_postun_with_restart oomd.service %changelog +* Tue Aug 03 2022 Davide Cavalca - 0.5.0-6 +- Backport upstream commit to add a missing include + Fixes: RHBZ#2113559 + * Fri Jul 22 2022 Fedora Release Engineering - 0.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild