Backport upstream commit to add a missing include
This commit is contained in:
parent
323301b7df
commit
15670b7a47
|
@ -0,0 +1,41 @@
|
||||||
|
From 83a6742f08349fbc93f459228dcc3d1f56eac411 Mon Sep 17 00:00:00 2001
|
||||||
|
From: ycitgez <yuhanun.citgez@flatexdegiro.com>
|
||||||
|
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 <algorithm>
|
||||||
|
+#include <array>
|
||||||
|
#include <condition_variable>
|
||||||
|
#include <iostream>
|
||||||
|
#include <mutex>
|
|
@ -3,7 +3,7 @@
|
||||||
Name: oomd
|
Name: oomd
|
||||||
Summary: Userspace Out-Of-Memory (OOM) killer
|
Summary: Userspace Out-Of-Memory (OOM) killer
|
||||||
Version: 0.5.0
|
Version: 0.5.0
|
||||||
Release: 5%{dist}
|
Release: 6%{dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://github.com/facebookincubator/oomd/
|
URL: https://github.com/facebookincubator/oomd/
|
||||||
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
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
|
Patch0: %{url}/commit/076af42b270388f38055fdf60dccbb3001de723a.patch
|
||||||
# Fix ODR violation in tests
|
# Fix ODR violation in tests
|
||||||
Patch1: %{url}/commit/3989e169fc0da9c29da8dd692427d4f4c1ace413.patch
|
Patch1: %{url}/commit/3989e169fc0da9c29da8dd692427d4f4c1ace413.patch
|
||||||
|
# Resolved a compiler error due to lacking include
|
||||||
|
Patch2: %{url}/commit/83a6742f08349fbc93f459228dcc3d1f56eac411.patch
|
||||||
|
|
||||||
|
|
||||||
ExcludeArch: i686 armv7hl
|
ExcludeArch: i686 armv7hl
|
||||||
|
@ -77,6 +79,10 @@ Furthermore, time spent livedlocked in kernelspace is minimized.
|
||||||
%systemd_postun_with_restart oomd.service
|
%systemd_postun_with_restart oomd.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 03 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 0.5.0-6
|
||||||
|
- Backport upstream commit to add a missing include
|
||||||
|
Fixes: RHBZ#2113559
|
||||||
|
|
||||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-5
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue