From 1f78a9996428fe0082eacd55767397f4f5a7758a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 22 Sep 2019 23:49:57 +0200 Subject: [PATCH] gnu: perf: Really build without '-Werror'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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'. --- gnu/packages/linux.scm | 4 ++++ 1 file changed, 4 insertions(+) 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 @@ (define-public perf (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)))