diff options
Diffstat (limited to 'meta/recipes-bsp/pciutils/pciutils-3.1.5/configure.patch')
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils-3.1.5/configure.patch | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.5/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.5/configure.patch new file mode 100644 index 0000000000..1bfe724750 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils-3.1.5/configure.patch | |||
@@ -0,0 +1,102 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | --- | ||
6 | |||
7 | 7/30/2010 - rebased to 3.1.5 by Qing He <qing.he@intel.com> | ||
8 | |||
9 | diff -uNr pciutils-3.1.5.orig/lib/configure pciutils-3.1.5/lib/configure | ||
10 | --- pciutils-3.1.5.orig/lib/configure 2010-07-30 13:51:58.000000000 +0800 | ||
11 | +++ pciutils-3.1.5/lib/configure 2010-07-30 13:53:25.000000000 +0800 | ||
12 | @@ -14,6 +14,10 @@ | ||
13 | fi | ||
14 | } | ||
15 | |||
16 | +VERSION=$1 | ||
17 | +IDSDIR=$2 | ||
18 | +DNS=yes | ||
19 | + | ||
20 | if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then | ||
21 | echo >&2 "Please run the configure script from the top-level Makefile" | ||
22 | exit 1 | ||
23 | @@ -21,8 +25,8 @@ | ||
24 | |||
25 | echo_n "Configuring libpci for your system..." | ||
26 | if [ -z "$HOST" ] ; then | ||
27 | - sys=`uname -s` | ||
28 | - rel=`uname -r` | ||
29 | + sys=${3:-`uname -s`} | ||
30 | + rel= | ||
31 | realsys="$sys" | ||
32 | if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] | ||
33 | then | ||
34 | @@ -30,7 +34,7 @@ | ||
35 | proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` | ||
36 | cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` | ||
37 | else | ||
38 | - cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'` | ||
39 | + cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`} | ||
40 | fi | ||
41 | if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] | ||
42 | then | ||
43 | @@ -40,7 +44,7 @@ | ||
44 | then | ||
45 | sys=cygwin | ||
46 | fi | ||
47 | - HOST=${3:-$cpu-$sys} | ||
48 | + HOST=$cpu-$sys | ||
49 | fi | ||
50 | [ -n "$RELEASE" ] && rel="${RELEASE}" | ||
51 | # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. | ||
52 | @@ -49,6 +53,21 @@ | ||
53 | sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
54 | echo " $host $rel $cpu $sys" | ||
55 | |||
56 | +if [ "$host" = "linux--gnueabi" ] | ||
57 | +then | ||
58 | + sys=linux | ||
59 | +fi | ||
60 | + | ||
61 | +if [ "$host" = "linux--uclibc" ] | ||
62 | +then | ||
63 | + sys=linux | ||
64 | +fi | ||
65 | + | ||
66 | +if [ "$host" = "linux--uclibcgnueabi" ] | ||
67 | +then | ||
68 | + sys=linux | ||
69 | +fi | ||
70 | + | ||
71 | c=config.h | ||
72 | m=config.mk | ||
73 | echo >$c '#define PCI_CONFIG_H' | ||
74 | diff -uNr pciutils-3.1.5.orig/Makefile pciutils-3.1.5/Makefile | ||
75 | --- pciutils-3.1.5.orig/Makefile 2010-07-30 13:51:58.000000000 +0800 | ||
76 | +++ pciutils-3.1.5/Makefile 2010-07-30 13:52:24.000000000 +0800 | ||
77 | @@ -37,7 +37,6 @@ | ||
78 | # Commands | ||
79 | INSTALL=install | ||
80 | DIRINSTALL=install -d | ||
81 | -STRIP=-s | ||
82 | CC=$(CROSS_COMPILE)gcc | ||
83 | AR=$(CROSS_COMPILE)ar | ||
84 | RANLIB=$(CROSS_COMPILE)ranlib | ||
85 | @@ -86,7 +85,7 @@ | ||
86 | example.o: example.c $(PCIINC) | ||
87 | |||
88 | %: %.o | ||
89 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ | ||
90 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) -o $@ | ||
91 | |||
92 | %.8 %.7: %.man | ||
93 | 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)#" | ||
94 | @@ -101,7 +100,7 @@ | ||
95 | install: all | ||
96 | # -c is ignored on Linux, but required on FreeBSD | ||
97 | $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 | ||
98 | - $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR) | ||
99 | + $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR) | ||
100 | $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) | ||
101 | $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) | ||
102 | $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 | ||