summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/pciutils/pciutils-3.1.5/configure.patch
blob: 1bfe7247505acf3494980fe2ff852fad31d29d96 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
---

7/30/2010 - rebased to 3.1.5 by Qing He <qing.he@intel.com>

diff -uNr pciutils-3.1.5.orig/lib/configure pciutils-3.1.5/lib/configure
--- pciutils-3.1.5.orig/lib/configure	2010-07-30 13:51:58.000000000 +0800
+++ pciutils-3.1.5/lib/configure	2010-07-30 13:53:25.000000000 +0800
@@ -14,6 +14,10 @@
 	fi
 }
 
+VERSION=$1
+IDSDIR=$2
+DNS=yes
+
 if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then
 	echo >&2 "Please run the configure script from the top-level Makefile"
 	exit 1
@@ -21,8 +25,8 @@
 
 echo_n "Configuring libpci for your system..."
 if [ -z "$HOST" ] ; then
-	sys=`uname -s`
-	rel=`uname -r`
+	sys=${3:-`uname -s`}
+	rel=
 	realsys="$sys"
 	if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ]
 	then
@@ -30,7 +34,7 @@
 		proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
 		cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
 	else
-		cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
+		cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`}
 	fi
 	if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
 	then
@@ -40,7 +44,7 @@
 	then
 		sys=cygwin
 	fi
-	HOST=${3:-$cpu-$sys}
+	HOST=$cpu-$sys
 fi
 [ -n "$RELEASE" ] && rel="${RELEASE}"
 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
@@ -49,6 +53,21 @@
 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo " $host $rel $cpu $sys"
 
+if [ "$host" = "linux--gnueabi" ]
+then
+	sys=linux
+fi
+
+if [ "$host" = "linux--uclibc" ]
+then
+	sys=linux
+fi
+
+if [ "$host" = "linux--uclibcgnueabi" ]
+then
+	sys=linux
+fi
+
 c=config.h
 m=config.mk
 echo >$c '#define PCI_CONFIG_H'
diff -uNr pciutils-3.1.5.orig/Makefile pciutils-3.1.5/Makefile
--- pciutils-3.1.5.orig/Makefile	2010-07-30 13:51:58.000000000 +0800
+++ pciutils-3.1.5/Makefile	2010-07-30 13:52:24.000000000 +0800
@@ -37,7 +37,6 @@
 # Commands
 INSTALL=install
 DIRINSTALL=install -d
-STRIP=-s
 CC=$(CROSS_COMPILE)gcc
 AR=$(CROSS_COMPILE)ar
 RANLIB=$(CROSS_COMPILE)ranlib
@@ -86,7 +85,7 @@
 example.o: example.c $(PCIINC)
 
 %: %.o
-	$(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
+	$(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@
 
 %.8 %.7: %.man
 	M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#"
@@ -101,7 +100,7 @@
 install: all
 # -c is ignored on Linux, but required on FreeBSD
 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
-	$(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
 	$(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
 	$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8