diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-09 13:55:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-09 14:13:33 +0100 |
| commit | 3d85c3ec652feb22824f355538b51e6955ded361 (patch) | |
| tree | 660b1db6cfa7ceb423c3d718b9843419f3a48908 /gnu/packages/pciutils.scm | |
| parent | 69a0440a02945b3fb8d156b7f9d96628059d5f67 (diff) | |
gnu: pciutils: Fix compilation error on GNU/Hurd.
* gnu/packages/patches/pciutils-hurd-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/pciutils.scm (pciutils)[arguments]: Add
'apply-hurd-patch' phase when (hurd-target?) is true.
[inputs]: Add "hurd-patch" entry when (hurd-target?) is true.
Diffstat (limited to 'gnu/packages/pciutils.scm')
| -rw-r--r-- | gnu/packages/pciutils.scm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index a5ed121c85..d7d224b292 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> @@ -92,7 +92,15 @@ (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. - (invoke "make" "install" "install-lib")))) + (invoke "make" "install" "install-lib"))) + + ,@(if (hurd-target?) + '((add-after 'unpack 'apply-hurd-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs "hurd-patch"))) + (invoke "patch" "-p1" "--batch" "-i" + patch))))) + '())) ;; Make sure programs have an RPATH so they can find libpciutils.so. #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" @@ -109,6 +117,9 @@ (package-supported-systems kmod)) `(("kmod" ,kmod)) '()) + ,@(if (hurd-target?) + `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) + '()) ("zlib" ,zlib))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") |