From c67b6fcf1ad6e8a482ceb0efa7a8584b2049f812 Mon Sep 17 00:00:00 2001 From: Chenxi Mao Date: Thu, 28 Oct 2021 09:25:11 +0800 Subject: [PATCH] libstoragemgmt: Upstream patch to avoid char usage in libstoragemgmt. Upstream change char to signed char to avoid build warning on non-x86 build. cherry-pick: f46f94f17704e7bf1557086f91c344401a9022ae Signed-off-by: Chenxi Mao --- 0002-Specify-signed-char.patch | 36 ++++++++++++++++++++++++++++++++++ libstoragemgmt.spec | 6 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0002-Specify-signed-char.patch diff --git a/0002-Specify-signed-char.patch b/0002-Specify-signed-char.patch new file mode 100644 index 0000000..4014844 --- /dev/null +++ b/0002-Specify-signed-char.patch @@ -0,0 +1,36 @@ +From 50cd68b994d988c116731a1ff36f3537c6103890 Mon Sep 17 00:00:00 2001 +From: Tony Asleson +Date: Wed, 12 Feb 2020 10:04:58 -0600 +Subject: [PATCH 1/1] Specify signed char + +x86 architecture default to signed characters. Other architectures +default to unsigned characters. When building on non-x86 arch we +get the following error + +./json.hpp:22700:42: required from here +./json.hpp:8494:24: error: comparison is always true due to limited + range of data type [-Werror=type-limits] + 8494 | if ('\x00' <= c and c <= '\x1F') + | ~~~~~~~^~~~ + +Signed-off-by: Tony Asleson +--- + c_binding/json.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/c_binding/json.hpp b/c_binding/json.hpp +index 6b6655a..a4ed769 100644 +--- a/c_binding/json.hpp ++++ b/c_binding/json.hpp +@@ -3097,7 +3097,7 @@ scan_number_done: + std::size_t chars_read = 0; + + /// raw input token string (for error messages) +- std::vector token_string {}; ++ std::vector token_string {}; + + /// buffer for variable-length tokens (numbers, strings) + string_t token_buffer {}; +-- +2.32.0 + diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec index 6a4f310..26e5866 100644 --- a/libstoragemgmt.spec +++ b/libstoragemgmt.spec @@ -2,13 +2,14 @@ %define with_python2 0 Name: libstoragemgmt Version: 1.8.0 -Release: 4 +Release: 5 Summary: Storage array management library License: LGPLv2+ URL: https://github.com/libstorage/libstoragemgmt Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz Patch1: 0001-change-run-dir.patch +Patch2: 0002-Specify-signed-char.patch BuildRequires: gcc gcc-c++ autoconf automake libtool libxml2-devel check-devel perl-interpreter BuildRequires: openssl-devel glib2-devel systemd bash-completion libconfig-devel systemd-devel @@ -370,6 +371,9 @@ fi %{_mandir}/man*/* %changelog +* Thu Oct 28 2021 Chenxi Mao - 1.8.0-5 +- libstoragemgmt: Upstream patch to avoid char usage in libstoragemgmt. + * Tue Sep 29 2020 baizhonggui - 1.8.0-4 - Modify source0