diff --git a/pciutils-2.1.99-gcc4.patch b/pciutils-2.1.99-gcc4.patch new file mode 100644 index 0000000..43257d5 --- /dev/null +++ b/pciutils-2.1.99-gcc4.patch @@ -0,0 +1,17 @@ +Patch by Robert Scheck 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); diff --git a/pciutils.spec b/pciutils.spec index f6ce686..2008758 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -11,6 +11,7 @@ Patch3: pciutils-havepread.patch Patch4: pciutils-typo.patch Patch5: pciutils-devicetype.patch Patch6: pciutils-domain.patch +Patch7: pciutils-2.1.99-gcc4.patch License: GPL URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -42,6 +43,7 @@ devices connected to the PCI bus. %patch4 -p1 -b .typo %patch5 -p1 -b .devicetype %patch6 -p1 -b .domain +%patch7 -p1 -b .glibcmacros %build 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 %changelog +* Mon Mar 14 2005 Bill Nottingham - 2.1.99.test8-8 +- add patch for glibc macros (#151032, ) + * Wed Mar 2 2005 Bill Nottingham - 2.1.99.test8-7 - FC4. GCC 4. fore!