diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-13 01:10:06 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-13 01:10:06 +0100 |
| commit | a7737f0ead2293536b9d0ba253de4673378a0ffa (patch) | |
| tree | cf80318b0a9903aa56a69c316659a52f94abbe27 /gnu/packages/patches/pciutils-hurd-fix.patch | |
| parent | ba47c83570b6d1824738ef5ff8580e7581990699 (diff) | |
| parent | 1adeb744560af94687eb7c3780c7145c52674070 (diff) | |
| download | guix-a7737f0ead2293536b9d0ba253de4673378a0ffa.tar.gz | |
Merge branch 'master' into ungrafting
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; + } + } |