ericLemanissier/conan-center-index
1
0
Fork 1
mirror of https://github.com/conan-io/conan-center-index.git synced 2025-08-14 02:35:37 +00:00
Code Issues 6 Packages Projects Releases Wiki Activity

(#14584) Fix json-schema-validator build on arm64/GCC 9.4

Browse Source
This commit is contained in:
Gareth Sylvester-Bradley
2022-12-06 13:25:44 +00:00
committed by GitHub
parent f541251f02
commit 5c5c9d1cba
2 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
recipes/json-schema-validator/all/conandata.yml
View File

@@ -9,6 +9,11 @@ sources:
url: "https://github.com/pboettch/json-schema-validator/archive/refs/tags/2.0.0.tar.gz"
sha256: "ca8e4ca5a88c49ea52b5f5c2a08a293dbf02b2fc66cb8c09d4cce5810ee98b57"
patches:
"2.2.0":
- patch_file: "patches/2.2.0-signed-char.patch"
patch_type: "portability"
patch_description: "Fix for PowerPC and ARM"
patch_source: "https://github.com/pboettch/json-schema-validator/pull/242"
"2.1.0":
- patch_file: "patches/2.1.0-cmake_minimum_version.patch"
patch_type: "conan"

64
recipes/json-schema-validator/all/patches/2.2.0-signed-char.patch Normal file
View File

@@ -0,0 +1,64 @@
From 3918616faf989fcf4a9206a34e3b87c23642a96a Mon Sep 17 00:00:00 2001
From: Robert Joslyn <robert.joslyn@redrectangle.org>
Date: Wed, 30 Nov 2022 13:07:29 -0800
Subject: [PATCH] Fix assumed signed char
The code assumes that char is signed, but whether char is signed or
unsigned is implementation defined. On some architectures like PowerPC,
GCC treats char as unsigned resulting in compile errors:
smtp-address-validator.cpp:213:1: error: narrowing conversion of '-32' from 'int' to 'char' [-Wnarrowing]
Fix this by specifying signed char.
---
src/smtp-address-validator.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/smtp-address-validator.cpp b/src/smtp-address-validator.cpp
index a63ead0..3903b51 100644
--- a/src/smtp-address-validator.cpp
+++ b/src/smtp-address-validator.cpp
@@ -63,7 +63,7 @@ static const short _address_key_offsets[] = {
1363, 1365, 1367, 1368, 1370, 1388, 0
};
-static const char _address_trans_keys[] = {
+static const signed char _address_trans_keys[] = {
-32, -19, -16, -12, 34, 45, 61, 63,
-62, -33, -31, -17, -15, -13, 33, 39,
42, 43, 47, 57, 65, 90, 94, 126,
@@ -711,7 +711,7 @@ bool is_address(const char* p, const char* pe)
{
int _klen;
unsigned int _trans = 0;
- const char * _keys;
+ const signed char * _keys;
const signed char * _acts;
unsigned int _nacts;
_resume: {}
@@ -728,9 +728,9 @@ bool is_address(const char* p, const char* pe)
_klen = (int)_address_single_lengths[cs];
if ( _klen > 0 ) {
- const char *_lower = _keys;
- const char *_upper = _keys + _klen - 1;
- const char *_mid;
+ const signed char *_lower = _keys;
+ const signed char *_upper = _keys + _klen - 1;
+ const signed char *_mid;
while ( 1 ) {
if ( _upper < _lower ) {
_keys += _klen;
@@ -752,9 +752,9 @@ bool is_address(const char* p, const char* pe)
_klen = (int)_address_range_lengths[cs];
if ( _klen > 0 ) {
- const char *_lower = _keys;
- const char *_upper = _keys + (_klen<<1) - 2;
- const char *_mid;
+ const signed char *_lower = _keys;
+ const signed char *_upper = _keys + (_klen<<1) - 2;
+ const signed char *_mid;
while ( 1 ) {
if ( _upper < _lower ) {
_trans += (unsigned int)_klen;