SOURCES: pciutils-LDFLAGS.patch, pciutils-pci_h.patch - updated fo...

[qboosh]

Author: qboosh                       Date: Sun Jun 24 10:24:14 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.2.6

---- Files affected:
SOURCES:
   pciutils-LDFLAGS.patch (1.1 -> 1.2) , pciutils-pci_h.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/pciutils-LDFLAGS.patch
diff -u SOURCES/pciutils-LDFLAGS.patch:1.1 SOURCES/pciutils-LDFLAGS.patch:1.2
--- SOURCES/pciutils-LDFLAGS.patch:1.1	Thu May 17 23:22:29 2007
+++ SOURCES/pciutils-LDFLAGS.patch	Sun Jun 24 12:24:09 2007
@@ -10,12 +10,12 @@
  		;;
      	gnu)
  		echo_n " i386-ports"
-@@ -121,7 +121,7 @@
- if [ "$zlib" = yes ] ; then
+@@ -122,7 +122,7 @@
  	echo >>$c '#define PCI_COMPRESSED_IDS'
  	echo >>$c '#define PCI_IDS "pci.ids.gz"'
--	echo >>$m 'LDFLAGS+=-lz'
-+	echo >>$m 'LIBS+=-lz'
+ 	echo >>$m 'LIBZ=-lz'
+-	echo >>$m 'LDFLAGS+=$(LIBZ)'
++	echo >>$m 'LIBS+=$(LIBZ)'
  else
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi

================================================================
Index: SOURCES/pciutils-pci_h.patch
diff -u SOURCES/pciutils-pci_h.patch:1.3 SOURCES/pciutils-pci_h.patch:1.4
--- SOURCES/pciutils-pci_h.patch:1.3	Wed Sep 21 22:14:44 2005
+++ SOURCES/pciutils-pci_h.patch	Sun Jun 24 12:24:09 2007
@@ -11,25 +11,3 @@
  
  #ifdef PCI_OS_WINDOWS
  #include "compat/getopt.h"
---- pciutils/Makefile.org	2005-09-21 21:52:22.329188000 +0200
-+++ pciutils/Makefile	2005-09-21 21:53:09.760152250 +0200
-@@ -15,7 +15,7 @@
- INSTALL=install
- DIRINSTALL=install -d
- PCILIB=lib/libpci.a
--PCIINC=lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
-+PCIINC=pci/config.h lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
- 
- ifeq ($(shell uname),NetBSD)
- PCILIB=libpciutils.a
-@@ -43,6 +43,9 @@
- lib/config.h:
- 	cd lib && ./configure $(IDSDIR) $(VERSION) $(HOST) $(RELEASE)
- 
-+pci/config.h:
-+	cd pci && ./configure $(IDSDIR) $(VERSION) $(HOST) $(RELEASE)
-+
- lspci: lspci.o common.o $(PCILIB)
- setpci: setpci.o common.o $(PCILIB)
- 
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pciutils-LDFLAGS.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/pciutils-pci_h.patch?r1=1.3&r2=1.4&f=u