Fix build on i686
This commit is contained in:
parent
f748372b51
commit
fdc011a2fd
34
0001-Use-correct-format-specifier-for-size_t.patch
Normal file
34
0001-Use-correct-format-specifier-for-size_t.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anuj.mittal@intel.com>
|
||||
Date: Wed, 26 Sep 2018 10:34:15 +0800
|
||||
Subject: [PATCH] Use correct format specifier for size_t
|
||||
|
||||
%zu instead of %lu, otherwise on 32 bit:
|
||||
|
||||
| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::sort_and_update_poll_trip()':
|
||||
| ../git/src/thd_zone.cpp:106:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=]
|
||||
| thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
| trip_points.size());
|
||||
|
||||
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
||||
---
|
||||
src/thd_zone.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
|
||||
index b7edf9e..cb7b8e8 100644
|
||||
--- a/src/thd_zone.cpp
|
||||
+++ b/src/thd_zone.cpp
|
||||
@@ -103,7 +103,7 @@ int cthd_zone::read_user_set_psv_temp() {
|
||||
}
|
||||
|
||||
void cthd_zone::sort_and_update_poll_trip() {
|
||||
- thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
|
||||
+ thd_log_debug("sort_and_update_poll_trip: trip_points_size =%zu\n",
|
||||
trip_points.size());
|
||||
if (trip_points.size()) {
|
||||
unsigned int polling_trip = 0;
|
||||
--
|
||||
2.21.0
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
Name: thermald
|
||||
Version: 1.8
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Thermal Management daemon
|
||||
|
||||
License: GPLv2+
|
||||
@ -32,6 +32,8 @@ Requires: dbus%{?_isa}
|
||||
Requires(pre): glibc-common
|
||||
Requires(pre): shadow-utils
|
||||
|
||||
Patch001: 0001-Use-correct-format-specifier-for-size_t.patch
|
||||
|
||||
%{?systemd_requires}
|
||||
|
||||
%description
|
||||
@ -240,6 +242,9 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri May 17 2019 Benjamin Berg <bberg@redhat.com> - 1.8-2
|
||||
- Fix build on i686
|
||||
|
||||
* Fri May 17 2019 Benjamin Berg <bberg@redhat.com> - 1.8-1
|
||||
- New upstream release (#1582506)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user