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.
This commit is contained in:
parent
69a0440a02
commit
3d85c3ec65
3 changed files with 37 additions and 2 deletions
|
@ -1435,6 +1435,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
|
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
|
||||||
%D%/packages/patches/pango-skip-libthai-test.patch \
|
%D%/packages/patches/pango-skip-libthai-test.patch \
|
||||||
%D%/packages/patches/pciutils-hurd-configure.patch \
|
%D%/packages/patches/pciutils-hurd-configure.patch \
|
||||||
|
%D%/packages/patches/pciutils-hurd-fix.patch \
|
||||||
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
|
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
|
||||||
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
|
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
|
||||||
%D%/packages/patches/samba-fix-fcntl-hint-detection.patch \
|
%D%/packages/patches/samba-fix-fcntl-hint-detection.patch \
|
||||||
|
|
23
gnu/packages/patches/pciutils-hurd-fix.patch
Normal file
23
gnu/packages/patches/pciutils-hurd-fix.patch
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
Fix a build error on GNU/Hurd for pciutils 3.7.0.
|
||||||
|
|
||||||
|
commit 053cf6c8b2acafadf828912828336d90fe9b8696
|
||||||
|
Author: Martin Mares <mj@ucw.cz>
|
||||||
|
Date: Sun May 31 11:53:28 2020 +0200
|
||||||
|
|
||||||
|
HURD backend should compile again
|
||||||
|
|
||||||
|
Fixes a bug introduced by commit 82c06b47dea5a38075ce9d56f743360bc47b4c78.
|
||||||
|
|
||||||
|
diff --git a/lib/hurd.c b/lib/hurd.c
|
||||||
|
index 7b3b2ae..ccd92f6 100644
|
||||||
|
--- a/lib/hurd.c
|
||||||
|
+++ b/lib/hurd.c
|
||||||
|
@@ -307,7 +307,6 @@ hurd_fill_regions(struct pci_dev *d)
|
||||||
|
d->base_addr[i] |= regions[i].is_64 << 2;
|
||||||
|
d->base_addr[i] |= regions[i].is_prefetchable << 3;
|
||||||
|
|
||||||
|
- if (flags & PCI_FILL_SIZES)
|
||||||
|
- d->size[i] = regions[i].size;
|
||||||
|
+ d->size[i] = regions[i].size;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; 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 © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
|
@ -92,7 +92,15 @@
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
;; Install the commands, library, and .pc files.
|
;; 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 sure programs have an RPATH so they can find libpciutils.so.
|
||||||
#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath="
|
#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath="
|
||||||
|
@ -109,6 +117,9 @@
|
||||||
(package-supported-systems kmod))
|
(package-supported-systems kmod))
|
||||||
`(("kmod" ,kmod))
|
`(("kmod" ,kmod))
|
||||||
'())
|
'())
|
||||||
|
,@(if (hurd-target?)
|
||||||
|
`(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch")))
|
||||||
|
'())
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
(home-page "https://mj.ucw.cz/sw/pciutils/")
|
(home-page "https://mj.ucw.cz/sw/pciutils/")
|
||||||
(synopsis "Programs for inspecting and manipulating PCI devices")
|
(synopsis "Programs for inspecting and manipulating PCI devices")
|
||||||
|
|
Reference in a new issue