03/09: gnu: flashrom: Support libusb versions >1.0.21.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 326654e42becaaa7829f8783bcf075f729d5ecef
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sun Mar 25 17:31:22 2018 +0200

    gnu: flashrom: Support libusb versions >1.0.21.
    
    * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Override CFLAGS
    in #:make-flags.
---
 gnu/packages/flashing-tools.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 36c8353..dd0eaa5 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -48,6 +48,7 @@
 (define-public flashrom
   (package
     (name "flashrom")
+    ;; XXX: The CFLAGS=... line below can probably be removed when updating.
     (version "1.0")
     (source (origin
               (method url-fetch)
@@ -64,9 +65,13 @@
               ("libftdi" ,libftdi)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (arguments
-     '(#:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" %output)
-                          "CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no")
+     '(#:make-flags
+       (list "CC=gcc"
+             ;; The default includes ‘-Wall -Werror’, causing the build to fail
+             ;; with deprecation warnings against libusb versions >= 1.0.22.
+             "CFLAGS=-Os -Wshadow"
+             (string-append "PREFIX=" %output)
+             "CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no")
        #:tests? #f                      ; no 'check' target
        #:phases
        (modify-phases %standard-phases