01/01: gnu: net-tools: Adapt to linux-libre-headers-3.14.x.

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit a153ff80c85c5aa426371a1b691395d953fc6a53
Author: Mark H Weaver <address@hidden>
Date:   Sun Apr 12 19:46:20 2015 -0400

    gnu: net-tools: Adapt to linux-libre-headers-3.14.x.
    
    * gnu/packages/linux.scm (net-tools): Remove the HAVE_HWSTRIP and HAVE_HWTR
      options from the configuration.
---
 gnu/packages/linux.scm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f04a94b..4a0f61e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -920,10 +920,12 @@ manpages.")
                       ;; Pretend we have everything...
                       (system "yes | make config")
 
-                      ;; ... except we don't have libdnet, so remove that
-                      ;; definition.
+                      ;; ... except for the things we don't have.
+                      ;; HAVE_AFDECnet requires libdnet, which we don't have.
+                      ;; HAVE_HWSTRIP and HAVE_HWTR require kernel headers
+                      ;; that have been removed.
                       (substitute* '("config.make" "config.h")
-                        (("^.*HAVE_AFDECnet.*$") ""))))
+                        (("^.*HAVE_(AFDECnet|HWSTRIP|HWTR)[ =]1.*$") ""))))
                   (alist-cons-after
                    'install 'remove-redundant-commands
                    (lambda* (#:key outputs #:allow-other-keys)