!14 修复libstoragemgmt编译报错too many arguments for format问题 和 提取上游补丁修复非X86的编译问题

From: @xigaoxinyan 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-04-26 01:05:13 +00:00 committed by Gitee
commit 2867f1284c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 3001 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 50cd68b994d988c116731a1ff36f3537c6103890 Mon Sep 17 00:00:00 2001
From: Tony Asleson <tasleson@redhat.com>
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 <tasleson@redhat.com>
---
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<char> token_string {};
+ std::vector<signed char> token_string {};
/// buffer for variable-length tokens (numbers, strings)
string_t token_buffer {};
--
2.32.0

File diff suppressed because it is too large Load Diff

View File

@ -2,13 +2,15 @@
%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
Patch3: fix-too-many-argument-for-format.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 +372,9 @@ fi
%{_mandir}/man*/*
%changelog
* Mon Apr 25 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 1.8.0-5
- fix too many argument for format and libstoragemgmt: Upstream patch to avoid char usage in libstoragemgmt.
* Tue Sep 29 2020 baizhonggui <baizhonggui@huawei.com> - 1.8.0-4
- Modify source0