aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-03-25 17:31:22 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2018-03-25 20:01:01 +0200
commit326654e42becaaa7829f8783bcf075f729d5ecef (patch)
treee2ebfbb3afcb9bddca363a12e60238d267826191
parent883fa31088544e27ee79f300adf415f917e48058 (diff)
downloadgnu-guix-326654e42becaaa7829f8783bcf075f729d5ecef.tar
gnu-guix-326654e42becaaa7829f8783bcf075f729d5ecef.tar.gz
gnu: flashrom: Support libusb versions >1.0.21.
* gnu/packages/flashing-tools.scm (flashrom)[arguments]: Override CFLAGS in #:make-flags.
-rw-r--r--gnu/packages/flashing-tools.scm11
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 36c8353ee0..dd0eaa5df8 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