summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-09-22 23:49:57 +0200
committerLudovic Courtès <ludo@gnu.org>2019-09-22 23:49:57 +0200
commit1f78a9996428fe0082eacd55767397f4f5a7758a (patch)
tree34ae104570a0a989889c3a90e35f03ad55a10e48 /gnu
parent4b577961d736d53063022d58483f0200ef860b2d (diff)
downloadguix-1f78a9996428fe0082eacd55767397f4f5a7758a.tar.gz
gnu: perf: Really build without '-Werror'.
Until this change, it would fail to build with:

  In file included from /tmp/guix-build-perf-5.2.15.drv-0/linux-5.2.15/tools/include/uapi/linux/ethtool.h:19:0,
		   from xsk.c:18:
  /gnu/store/…-linux-libre-headers-4.19.56/include/linux/if_ether.h:165:1: error: packed attribute is unnecessary for 'ethhdr' [-Werror=packed]

* gnu/packages/linux.scm (perf)[arguments]: In 'configure' phase, remove
"-Werror" from 'tools/lib/bpf/Makefile'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/linux.scm4
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index be18788687..b65303ae6f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3082,6 +3082,10 @@ in a digital read-out.")
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key inputs #:allow-other-keys)
+             ;; Don't build with '-Werror', really.
+             (substitute* "tools/lib/bpf/Makefile"
+               (("-Werror") ""))
+
              (setenv "SHELL_PATH" (which "bash"))
              (chdir "tools/perf")
              #t)))