rpms/pciutils/devel pciutils-2.2.3-multilib.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/pciutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1607

Modified Files:
	pciutils-2.2.3-multilib.patch 
Log Message:
take config.mk into account


pciutils-2.2.3-multilib.patch:
 configure |   94 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 42 insertions(+), 52 deletions(-)

Index: pciutils-2.2.3-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils-2.2.3-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-2.2.3-multilib.patch	23 May 2006 12:44:01 -0000	1.1
+++ pciutils-2.2.3-multilib.patch	23 May 2006 12:59:26 -0000	1.2
@@ -1,32 +1,67 @@
 --- pciutils-2.2.3/lib/configure.multilib	2006-05-05 14:25:07.000000000 +0200
-+++ pciutils-2.2.3/lib/configure	2006-05-23 14:24:19.000000000 +0200
-@@ -30,77 +30,34 @@
++++ pciutils-2.2.3/lib/configure	2006-05-23 14:58:22.000000000 +0200
+@@ -30,8 +30,35 @@
  echo " $host $rel"
  
  c=config.h
 -echo >$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
 -echo >>$c "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`"
--
--echo_n "Looking for access methods..."
--
--case $sys in
--	linux*)
--		case $rel in
--			2.[1-9]*|[3-9]*)	echo_n " sysfs proc"
++cm=config.h.mk
++cat >$c <<EOF
++#if defined(__i386__)
++#define PCI_ARCH_I386
++#define PCI_HAVE_PM_INTEL_CONF
++#elif defined(__x86_64__)
++#define PCI_ARCH_X86_64
++#elif defined(__ia64__)
++#define PCI_ARCH_IA64
++#elif defined(__ppc64__)
++#define PCI_ARCH_PPC64
++#elif defined(__ppc__)
++#define PCI_ARCH_PPC
++#elif defined(__s390__)
++#define PCI_ARCH_S390
++#elif defined(__s390x__)
++#define PCI_ARCH_S390X
++#else
++#error Unknown Arch
++#endif
++#define PCI_OS_LINUX
++#define PCI_HAVE_PM_LINUX_SYSFS
++#define PCI_HAVE_PM_LINUX_PROC
++#define PCI_HAVE_LINUX_BYTEORDER_H
++#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
++#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
++#define PCI_HAVE_PM_INTEL_CONF
++#define PCI_HAVE_64BIT_ADDRESS
++EOF
+ 
+ echo_n "Looking for access methods..."
+ 
+@@ -39,63 +66,22 @@
+ 	linux*)
+ 		case $rel in
+ 			2.[1-9]*|[3-9]*)	echo_n " sysfs proc"
 -						echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS'
 -						echo >>$c '#define PCI_HAVE_PM_LINUX_PROC'
 -						echo >>$c '#define PCI_HAVE_LINUX_BYTEORDER_H'
 -						echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
 -						echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
--						ok=1
--						;;
--		esac
--		case $cpu in
--				i386)		echo_n " i386-ports"
++						echo >>$cm '#define PCI_HAVE_PM_LINUX_SYSFS'
++						echo >>$cm '#define PCI_HAVE_PM_LINUX_PROC'
++						echo >>$cm '#define PCI_HAVE_LINUX_BYTEORDER_H'
++						echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
++						echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
+ 						ok=1
+ 						;;
+ 		esac
+ 		case $cpu in
+ 				i386)		echo_n " i386-ports"
 -						echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
--						ok=1
--						;;
--		esac
++						echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF'
+ 						ok=1
+ 						;;
+ 		esac
 -		echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
 -		;;
 -	sunos)
@@ -70,39 +105,24 @@
 -		echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
 -		ok=1
 -		;;
--        *)
--		echo " Unfortunately, your OS is not supported by the PCI Library"
--		exit 1
--		;;
--esac
-+cat >$c <<EOF
-+#if defined(__i386__)
-+#define PCI_ARCH_I386
-+#define PCI_HAVE_PM_INTEL_CONF
-+#elif defined(__x86_64__)
-+#define PCI_ARCH_X86_64
-+#elif defined(__ia64__)
-+#define PCI_ARCH_IA64
-+#elif defined(__ppc64__)
-+#define PCI_ARCH_PPC64
-+#elif defined(__ppc__)
-+#define PCI_ARCH_PPC
-+#elif defined(__s390__)
-+#define PCI_ARCH_S390
-+#elif defined(__s390x__)
-+#define PCI_ARCH_S390X
-+#else
-+#error Unknown Arch
-+#endif
-+#define PCI_OS_LINUX
-+#define PCI_HAVE_PM_LINUX_SYSFS
-+#define PCI_HAVE_PM_LINUX_PROC
-+#define PCI_HAVE_LINUX_BYTEORDER_H
-+#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
-+#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
-+#define PCI_HAVE_PM_INTEL_CONF
-+#define PCI_HAVE_64BIT_ADDRESS
-+EOF
++		echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS'
++		;;		
+         *)
+ 		echo " Unfortunately, your OS is not supported by the PCI Library"
+ 		exit 1
+@@ -103,10 +89,14 @@
+ esac
  
  echo >>$c '#define PCI_HAVE_PM_DUMP'
++echo >>$cm '#define PCI_HAVE_PM_DUMP'
  echo " dump"
+ if [ -z "$ok" ] ; then
+ 	echo "WARNING: No real configuration access method is available."
+ fi
+ echo >>$c "#define PCI_PATH_IDS \"$idsdir/pci.ids\""
+ echo >>$c "#define PCILIB_VERSION \"$version\""
+-sed '/^#define [^ ]*$/!d;s/^#define \(.*\)/\1=1/' <$c >config.mk
++
++echo >>$cm "#define PCI_PATH_IDS \"$idsdir/pci.ids\""
++echo >>$cm "#define PCILIB_VERSION \"$version\""
++sed '/^#define [^ ]*$/!d;s/^#define \(.*\)/\1=1/' <$cm >config.mk