dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

{influxdb, influxdb2}: fix build on aarch64-linux

Browse Source 
An inadvertent reliance on `char` being signed crept into `libflux`;
this patch specifies a signed 8-bit type for the literal and then
explicitly casts to the appropriate platform `c_char` type.
This commit is contained in:
Mitchell Skaggs 2024-06-15 23:56:05 -05:00
parent 746c184625
commit d7aecd3cb0
No known key found for this signature in database
GPG Key ID: 4EB0FECB84AE8967
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/servers/nosql/influxdb/default.nix
View File

@ -23,6 +23,7 @@ let
excludes = [ ];
hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc=";
})
../influxdb2/fix-unsigned-char.patch
];
sourceRoot = "${src.name}/libflux";
cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";

1
pkgs/servers/nosql/influxdb2/default.nix
View File

@ -48,6 +48,7 @@ let
excludes = [ ];
hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc=";
})
./fix-unsigned-char.patch
];
sourceRoot = "${src.name}/libflux";
cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";

13
pkgs/servers/nosql/influxdb2/fix-unsigned-char.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/flux/src/cffi.rs b/flux/src/cffi.rs
index ba18e3d5..0c1badf8 100644
--- a/flux/src/cffi.rs
+++ b/flux/src/cffi.rs
@@ -1149,7 +1149,7 @@ from(bucket: v.bucket)
fn parse_with_invalid_utf8() {
let cfname = CString::new("foo.flux").unwrap();
let cfname_ptr: *const c_char = cfname.as_ptr();
- let v: Vec<c_char> = vec![-61, 0];
+ let v: Vec<c_char> = vec![-61i8 as c_char, 0];
let csrc: *const c_char = &v[0];
// Safety: both pointers are valid
let pkg = unsafe { flux_parse(cfname_ptr, csrc) };