libbladeRF: gcc-14 fixes (#362314)

This commit is contained in:
Markus Kowalewski
2024-12-06 16:17:38 +01:00
committed by GitHub
2 changed files with 31 additions and 0 deletions
@@ -0,0 +1,26 @@
diff --git a/host/utilities/bladeRF-fsk/c/src/fir_filter.c b/host/utilities/bladeRF-fsk/c/src/fir_filter.c
index 59f34f0..7def697 100644
--- a/host/utilities/bladeRF-fsk/c/src/fir_filter.c
+++ b/host/utilities/bladeRF-fsk/c/src/fir_filter.c
@@ -213,18 +213,18 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
}
- inbuf = calloc(2*sizeof(int16_t), chunk_size);
+ inbuf = calloc(chunk_size, 2*sizeof(int16_t));
if (!inbuf) {
perror("calloc");
goto out;
}
- tempbuf = calloc(2*sizeof(int16_t), chunk_size);
+ tempbuf = calloc(chunk_size, 2*sizeof(int16_t));
if (!tempbuf) {
perror("calloc");
goto out;
}
- outbuf = calloc(sizeof(struct complex_sample), chunk_size);
+ outbuf = calloc(chunk_size, sizeof(struct complex_sample));
if (!outbuf) {
perror("calloc");
goto out;
+5
View File
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# https://github.com/Nuand/bladeRF/issues/994
./gcc-14-calloc-fixes.diff
];
nativeBuildInputs = [ cmake pkg-config git doxygen help2man ];
# ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208
buildInputs = [ tecla libusb1 ]