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