rpms/pciutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

add patch for read() macros

Browse Source
This commit is contained in:
Bill Nottingham 2005-03-14 17:36:54 +00:00
parent beab8c22a9
commit 220a77b760
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pciutils-2.1.99-gcc4.patch Normal file
View File

@ -0,0 +1,17 @@
Patch by Robert Scheck <redhat@linuxnetz.de> for pciutils >= 2.1.99, which make pciutils
rebuildable using gcc 4.
--- pciutils-2.1.99-test8/lib/i386-ports.c 2004-08-13 22:13:11.000000000 +0200
+++ pciutils-2.1.99-test8/lib/i386-ports.c.gcc4 2005-03-14 09:30:06.000000000 +0100
@@ -57,9 +57,9 @@
for(d.dev = 0; d.dev < 32; d.dev++)
{
u16 class, vendor;
- if (m->read(&d, PCI_CLASS_DEVICE, (byte *) &class, sizeof(class)) &&
+ if ((m->read) (&d, PCI_CLASS_DEVICE, (byte *) &class, sizeof(class)) &&
(class == cpu_to_le16(PCI_CLASS_BRIDGE_HOST) || class == cpu_to_le16(PCI_CLASS_DISPLAY_VGA)) ||
- m->read(&d, PCI_VENDOR_ID, (byte *) &vendor, sizeof(vendor)) &&
+ (m->read) (&d, PCI_VENDOR_ID, (byte *) &vendor, sizeof(vendor)) &&
(vendor == cpu_to_le16(PCI_VENDOR_ID_INTEL) || vendor == cpu_to_le16(PCI_VENDOR_ID_COMPAQ)))
{
a->debug("...outside the Asylum at 0/%02x/0", d.dev);

5
pciutils.spec
View File

@ -11,6 +11,7 @@ Patch3: pciutils-havepread.patch
Patch4: pciutils-typo.patch Patch4: pciutils-typo.patch
Patch5: pciutils-devicetype.patch Patch5: pciutils-devicetype.patch
Patch6: pciutils-domain.patch Patch6: pciutils-domain.patch
Patch7: pciutils-2.1.99-gcc4.patch
License: GPL License: GPL
URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
@ -42,6 +43,7 @@ devices connected to the PCI bus.
%patch4 -p1 -b .typo %patch4 -p1 -b .typo
%patch5 -p1 -b .devicetype %patch5 -p1 -b .devicetype
%patch6 -p1 -b .domain %patch6 -p1 -b .domain
%patch7 -p1 -b .glibcmacros
%build %build
make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr"
@ -73,6 +75,9 @@ install lib/types.h $RPM_BUILD_ROOT%{_includedir}/pci
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Mar 14 2005 Bill Nottingham <notting@redhat.com> - 2.1.99.test8-8
- add patch for glibc macros (#151032, <redhat-bugzilla@linuxnetz.de>)
* Wed Mar 2 2005 Bill Nottingham <notting@redhat.com> - 2.1.99.test8-7 * Wed Mar 2 2005 Bill Nottingham <notting@redhat.com> - 2.1.99.test8-7
- FC4. GCC 4. fore! - FC4. GCC 4. fore!