Commit 6827e8d3 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

libbladeRF: fix `clang` build 

Without the change the build fails as
https://hydra.nixos.org/build/313370704:

    /private/tmp/nix-build-libbladeRF-2025.10.drv-0/source/host/utilities/bladeRF-cli/src/cmd/flash_image.c:71:35:
      error: overlapping comparisons always evaluate to true [-Werror,-Wtautological-overlap-compare]
       71 |                 if (val[i] >= 'a' || val[i] <= 'f') {
          |                     ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
parent 042d0c7f

pkgs/by-name/li/libbladeRF/clang-fix.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Fix clang build: https://github.com/Nuand/bladeRF/pull/1045.patch

--- a/host/utilities/bladeRF-cli/src/cmd/flash_image.c

+++ b/host/utilities/bladeRF-cli/src/cmd/flash_image.c

@@ -68,7 +68,7 @@ static int handle_param(const char *param, char *val,

             status = CLI_RET_INVPARAM;

         } else {

             for (i = 0; i < len && status == 0; i++) {

-                if (val[i] >= 'a' || val[i] <= 'f') {

+                if (val[i] >= 'a' && val[i] <= 'f') {

                     val[i] -= 'a' - 'A';

                 } else if (!((val[i] >= '0' && val[i] <= '9') ||

                              (val[i] >= 'A' && val[i] <= 'F'))) {

pkgs/by-name/li/libbladeRF/package.nix

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec { 
    fetchSubmodules = true;

  };



  patches = [

    # fix clang build: https://github.com/Nuand/bladeRF/pull/1045

    ./clang-fix.patch

  ];



  nativeBuildInputs = [

    cmake

    pkg-config