25/31: gnu: pciutils: Build fixes for the Hurd.

[guix-commits]

janneke pushed a commit to branch wip-hurd
in repository guix.

commit 4a2613a3bc9331ea4e52def69eba23a56a923a5d
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sat Mar 7 04:05:02 2020 -0500

    gnu: pciutils: Build fixes for the Hurd.
    
    * gnu/packages/linux.scm (kmod)[supported-systems]: Remove the Hurd.
    * gnu/packages/patches/pciutils-hurd-configure.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/pciutils.scm (pciutils): Use it.
    [inputs]: Include kmod only for supported systems.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/linux.scm                             |  1 +
 gnu/packages/patches/pciutils-hurd-configure.patch | 35 ++++++++++++++++++++++
 gnu/packages/pciutils.scm                          | 10 ++++++-
 4 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 2ab58b9..b25d369 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1281,6 +1281,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/p7zip-remove-unused-code.patch          \
   %D%/packages/patches/pam-mount-luks2-support.patch           \
   %D%/packages/patches/pango-skip-libthai-test.patch           \
+  %D%/packages/patches/pciutils-hurd-configure.patch           \
   %D%/packages/patches/sdl-pango-api_additions.patch           \
   %D%/packages/patches/sdl-pango-blit_overflow.patch           \
   %D%/packages/patches/sdl-pango-fillrect_crash.patch          \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b73b86b..3abfc46 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2784,6 +2784,7 @@ to use Linux' inotify mechanism, which allows file 
accesses to be monitored.")
                          '("insmod" "rmmod" "lsmod" "modprobe"
                            "modinfo" "depmod"))
                #t))))))
+    (supported-systems (delete "i586-gnu" %supported-systems))
     (home-page "https://www.kernel.org/";)
     (synopsis "Kernel module tools")
     (description "Kmod is a set of tools to handle common tasks with Linux
diff --git a/gnu/packages/patches/pciutils-hurd-configure.patch 
b/gnu/packages/patches/pciutils-hurd-configure.patch
new file mode 100644
index 0000000..226891a
--- /dev/null
+++ b/gnu/packages/patches/pciutils-hurd-configure.patch
@@ -0,0 +1,35 @@
+Add ability to detect GNU/Hurd when configuring.
+
+Adapted from 
https://git.hadrons.org/cgit/debian/pkgs/pciutils.git/tree/debian/patches/00-configure-hurd.patch
+
+From e39a3af22501234a91cf28e8c57b45f9379f9101 Mon Sep 17 00:00:00 2001
+From: Damien Zammit <address@hidden>
+Date: Fri, 26 Oct 2018 09:24:04 -0400
+Subject: [PATCH 2/2] Add ability to detect GNU/Hurd when configuring
+
+---
+ lib/configure |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/lib/configure
++++ b/lib/configure
+@@ -25,7 +25,7 @@ if [ -z "$HOST" ] ; then
+               proc=`/usr/sbin/lsdev -C -c processor -S available -F name | 
head -1`
+               cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
+       else
+-              cpu=`uname -m | sed 
's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
++              cpu=`uname -m | sed 
's/^i.86-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
+       fi
+       if [ "$sys" = "DragonFly" ]
+       then
+@@ -39,6 +39,10 @@ if [ -z "$HOST" ] ; then
+       then
+               sys=cygwin
+       fi
++      if [ "$sys" = "GNU" ]
++      then
++              sys=gnu
++      fi
+       HOST=${3:-$cpu-$sys}
+ fi
+ [ -n "$RELEASE" ] && rel="${RELEASE}"
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index 0a55299..c992988 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,8 +26,10 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages hurd)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages base))
 
@@ -39,6 +42,7 @@
               (uri (string-append
                     "mirror://kernel.org/software/utils/pciutils/pciutils-"
                     version ".tar.xz"))
+              (patches (search-patches "pciutils-hurd-configure.patch"))
               (sha256
                (base32
                 "0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn"))))
@@ -100,7 +104,11 @@
      `(("which" ,which)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("kmod" ,kmod)
+     `(,@(if (member (or (%current-target-system)
+                         (%current-system))
+                     (package-supported-systems kmod))
+             `(("kmod" ,kmod))
+             '())
        ("zlib" ,zlib)))
     (home-page "https://mj.ucw.cz/sw/pciutils/";)
     (synopsis "Programs for inspecting and manipulating PCI devices")