[people/pmueller/ipfire-2.x.git] / src / patches / pciutils-2.2.3-multilib.patch

--- pciutils-2.2.3/lib/configure.multilib	2006-05-05 14:25:07.000000000 +0200
+++ pciutils-2.2.3/lib/configure	2006-05-23 15:50:16.000000000 +0200
@@ -30,8 +30,37 @@
 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'`"
+cm=config.h.mk
+cat >$c <<EOF
+#if defined(__x86_64__)
+#define PCI_ARCH_X86_64
+#elif defined(__ia64__)
+#define PCI_ARCH_IA64
+#elif defined(__i386__)
+#define PCI_ARCH_I386
+#define PCI_HAVE_PM_INTEL_CONF
+#elif defined(__ppc64__) || defined(__powerpc64__)
+#define PCI_ARCH_PPC64
+#elif defined(__ppc__)  || defined(__powerpc__)
+#define PCI_ARCH_PPC
+#elif defined(__s390x__)
+#define PCI_ARCH_S390X
+#elif defined(__s390__)
+#define PCI_ARCH_S390
+#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_64BIT_ADDRESS
+EOF
+
+echo >$cm "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
+echo >>$cm "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`"
 
 echo_n "Looking for access methods..."
 
@@ -39,63 +68,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 >>$c '#define PCI_HAVE_PM_INTEL_CONF'
+						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
-		echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
-		;;
-	sunos)
 		case $cpu in
 				i386)		echo_n " i386-ports"
-						echo >>$c "#define PCI_HAVE_PM_INTEL_CONF"
+						echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF'
 						ok=1
 						;;
-				*)
-						echo " The PCI library is does not support Solaris for this architecture: $cpu"
-						exit 1
-						;;
 		esac
-		;;
-		
-	freebsd)
-		echo_n " fbsd-device"
-		echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
-		echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
-		ok=1
-		;;
-        openbsd)
-	        echo_n " obsd-device"
-		echo >>$c '#define PCI_HAVE_PM_OBSD_DEVICE'
-		echo >>$c '#define PCI_PATH_OBSD_DEVICE "/dev/pci"'
-		ok=1
-		;;
-	aix)
-		echo_n " aix-device"
-		echo >>$c '#define PCI_HAVE_PM_AIX_DEVICE'
-		ok=1
-		;;
-	netbsd)
-		echo_n " nbsd-libpci"
-		echo >>$c '#define PCI_HAVE_PM_NBSD_LIBPCI'
-		echo >>$c '#define PCI_PATH_NBSD_DEVICE "/dev/pci0"'
-		ok=1
-		;;
-    	gnu)
-		echo_n " i386-ports"
-		echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
-		ok=1
-		;;
+		echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS'
+		;;		
         *)
 		echo " Unfortunately, your OS is not supported by the PCI Library"
 		exit 1
@@ -103,10 +91,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
Commit	Line	Data
72d80898 MT	1	--- pciutils-2.2.3/lib/configure.multilib 2006-05-05 14:25:07.000000000 +0200
	2	+++ pciutils-2.2.3/lib/configure 2006-05-23 15:50:16.000000000 +0200
	3	@@ -30,8 +30,37 @@
	4	echo " $host $rel"
	5
	6	c=config.h
	7	-echo >$c "#define PCI_ARCH_`echo $cpu \| tr 'a-z' 'A-Z'`"
	8	-echo >>$c "#define PCI_OS_`echo $sys \| tr 'a-z' 'A-Z'`"
	9	+cm=config.h.mk
	10	+cat >$c <<EOF
	11	+#if defined(__x86_64__)
	12	+#define PCI_ARCH_X86_64
	13	+#elif defined(__ia64__)
	14	+#define PCI_ARCH_IA64
	15	+#elif defined(__i386__)
	16	+#define PCI_ARCH_I386
	17	+#define PCI_HAVE_PM_INTEL_CONF
	18	+#elif defined(__ppc64__) \|\| defined(__powerpc64__)
	19	+#define PCI_ARCH_PPC64
	20	+#elif defined(__ppc__) \|\| defined(__powerpc__)
	21	+#define PCI_ARCH_PPC
	22	+#elif defined(__s390x__)
	23	+#define PCI_ARCH_S390X
	24	+#elif defined(__s390__)
	25	+#define PCI_ARCH_S390
	26	+#else
	27	+#error Unknown Arch
	28	+#endif
	29	+#define PCI_OS_LINUX
	30	+#define PCI_HAVE_PM_LINUX_SYSFS
	31	+#define PCI_HAVE_PM_LINUX_PROC
	32	+#define PCI_HAVE_LINUX_BYTEORDER_H
	33	+#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
	34	+#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
	35	+#define PCI_HAVE_64BIT_ADDRESS
	36	+EOF
	37	+
	38	+echo >$cm "#define PCI_ARCH_`echo $cpu \| tr 'a-z' 'A-Z'`"
	39	+echo >>$cm "#define PCI_OS_`echo $sys \| tr 'a-z' 'A-Z'`"
	40
	41	echo_n "Looking for access methods..."
	42
	43	@@ -39,63 +68,22 @@
	44	linux*)
	45	case $rel in
	46	2.[1-9]\|[3-9]) echo_n " sysfs proc"
	47	- echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS'
	48	- echo >>$c '#define PCI_HAVE_PM_LINUX_PROC'
	49	- echo >>$c '#define PCI_HAVE_LINUX_BYTEORDER_H'
	50	- echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
	51	- echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
	52	- ok=1
	53	- ;;
	54	- esac
	55	- case $cpu in
	56	- i386) echo_n " i386-ports"
	57	- echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
	58	+ echo >>$cm '#define PCI_HAVE_PM_LINUX_SYSFS'
	59	+ echo >>$cm '#define PCI_HAVE_PM_LINUX_PROC'
	60	+ echo >>$cm '#define PCI_HAVE_LINUX_BYTEORDER_H'
	61	+ echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
	62	+ echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
	63	ok=1
	64	;;
65	esac
66	- echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
67	- ;;
68	- sunos)
69	case $cpu in
70	i386) echo_n " i386-ports"
71	- echo >>$c "#define PCI_HAVE_PM_INTEL_CONF"
72	+ echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF'
73	ok=1
74	;;
75	- *)
76	- echo " The PCI library is does not support Solaris for this architecture: $cpu"
77	- exit 1
78	- ;;
79	esac
80	- ;;
81	-
82	- freebsd)
83	- echo_n " fbsd-device"
84	- echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
85	- echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
86	- ok=1
87	- ;;
88	- openbsd)
89	- echo_n " obsd-device"
90	- echo >>$c '#define PCI_HAVE_PM_OBSD_DEVICE'
91	- echo >>$c '#define PCI_PATH_OBSD_DEVICE "/dev/pci"'
92	- ok=1
93	- ;;
94	- aix)
95	- echo_n " aix-device"
96	- echo >>$c '#define PCI_HAVE_PM_AIX_DEVICE'
97	- ok=1
98	- ;;
99	- netbsd)
100	- echo_n " nbsd-libpci"
101	- echo >>$c '#define PCI_HAVE_PM_NBSD_LIBPCI'
102	- echo >>$c '#define PCI_PATH_NBSD_DEVICE "/dev/pci0"'
103	- ok=1
104	- ;;
105	- gnu)
106	- echo_n " i386-ports"
107	- echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
108	- ok=1
109	- ;;
110	+ echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS'
111	+ ;;
112	*)
113	echo " Unfortunately, your OS is not supported by the PCI Library"
114	exit 1
115	@@ -103,10 +91,14 @@
116	esac
117
118	echo >>$c '#define PCI_HAVE_PM_DUMP'
119	+echo >>$cm '#define PCI_HAVE_PM_DUMP'
120	echo " dump"
121	if [ -z "$ok" ] ; then
122	echo "WARNING: No real configuration access method is available."
123	fi
124	echo >>$c "#define PCI_PATH_IDS \"$idsdir/pci.ids\""
125	echo >>$c "#define PCILIB_VERSION \"$version\""
126	-sed '/^#define [^ ]$/!d;s/^#define \(.\)/\1=1/' <$c >config.mk
127	+
128	+echo >>$cm "#define PCI_PATH_IDS \"$idsdir/pci.ids\""
129	+echo >>$cm "#define PCILIB_VERSION \"$version\""
130	+sed '/^#define [^ ]$/!d;s/^#define \(.\)/\1=1/' <$cm >config.mk