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/patches/pciutils-hurd-fix.patch | |
| parent | 69a0440a02945b3fb8d156b7f9d96628059d5f67 (diff) | |
| download | guix-3d85c3ec652feb22824f355538b51e6955ded361.tar guix-3d85c3ec652feb22824f355538b51e6955ded361.tar.gz | |
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/patches/pciutils-hurd-fix.patch')
| -rw-r--r-- | gnu/packages/patches/pciutils-hurd-fix.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/gnu/packages/patches/pciutils-hurd-fix.patch b/gnu/packages/patches/pciutils-hurd-fix.patch new file mode 100644 index 0000000000..f1979d4352 --- /dev/null +++ b/gnu/packages/patches/pciutils-hurd-fix.patch @@ -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; + } + } |