diff options
Diffstat (limited to 'meta/recipes-bsp/pciutils/pciutils/configure.patch')
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils/configure.patch | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index e444c13975..5015cf4884 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch | |||
@@ -1,9 +1,14 @@ | |||
1 | From 561216c8cbc280aaa9aecf30cb11835a4a0a78ed Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <rpurdie@linux.intel.com> | ||
3 | Date: Wed, 31 Dec 2008 17:20:38 +0000 | ||
4 | Subject: [PATCH] pciutils: Upgarde 2.2.4 -> 3.0.3 | ||
5 | |||
1 | This patch: | 6 | This patch: |
2 | * ensures we link correctly | 7 | * ensures we link correctly |
3 | * allows us to optionally pass target information to configure rather than using uname | 8 | * allows us to optionally pass target information to configure rather than using uname |
4 | * select linux as the platform in most cases we care about | 9 | * select linux as the platform in most cases we care about |
5 | 10 | ||
6 | This is a merge of various tweaks to allow us to build pciutils including | 11 | This is a merge of various tweaks to allow us to build pciutils including |
7 | work from: | 12 | work from: |
8 | 13 | ||
9 | 7/30/2010 - Qing He <qing.he@intel.com> | 14 | 7/30/2010 - Qing He <qing.he@intel.com> |
@@ -12,24 +17,28 @@ Ionut Radu <ionutx.radu@intel.com> | |||
12 | 2017/6/15 - RP - Cleanups and merging patches | 17 | 2017/6/15 - RP - Cleanups and merging patches |
13 | 18 | ||
14 | Upstream-Status: Inappropriate [embedded specific] | 19 | Upstream-Status: Inappropriate [embedded specific] |
20 | --- | ||
21 | Makefile | 2 +- | ||
22 | lib/configure | 14 ++++++++++---- | ||
23 | 2 files changed, 11 insertions(+), 5 deletions(-) | ||
15 | 24 | ||
16 | Index: pciutils-3.5.6/Makefile | 25 | diff --git a/Makefile b/Makefile |
17 | =================================================================== | 26 | index aaec04e..9c1dab0 100644 |
18 | --- pciutils-3.5.6.orig/Makefile | 27 | --- a/Makefile |
19 | +++ pciutils-3.5.6/Makefile | 28 | +++ b/Makefile |
20 | @@ -96,7 +96,7 @@ example: example.o lib/$(PCILIB) | 29 | @@ -123,7 +123,7 @@ pcilmr$(EXEEXT): pcilmr.o $(LMROBJS) $(COMMON) lib/$(PCIIMPLIB) |
21 | example.o: example.c $(PCIINC) | 30 | pcilmr.o: pcilmr.c $(LMRINC) |
22 | 31 | ||
23 | %: %.o | 32 | %$(EXEEXT): %.o |
24 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ | 33 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ |
25 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ | 34 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ |
26 | 35 | ||
27 | %.8 %.7 %.5: %.man | 36 | ifdef PCI_OS_WINDOWS |
28 | 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)#" | 37 | comma := , |
29 | Index: pciutils-3.5.6/lib/configure | 38 | diff --git a/lib/configure b/lib/configure |
30 | =================================================================== | 39 | index 3df057a..c87e71c 100755 |
31 | --- pciutils-3.5.6.orig/lib/configure | 40 | --- a/lib/configure |
32 | +++ pciutils-3.5.6/lib/configure | 41 | +++ b/lib/configure |
33 | @@ -9,6 +9,10 @@ echo_n() { | 42 | @@ -9,6 +9,10 @@ echo_n() { |
34 | printf '%s' "$*" | 43 | printf '%s' "$*" |
35 | } | 44 | } |
@@ -38,7 +47,7 @@ Index: pciutils-3.5.6/lib/configure | |||
38 | +IDSDIR=$2 | 47 | +IDSDIR=$2 |
39 | +DNS=yes | 48 | +DNS=yes |
40 | + | 49 | + |
41 | if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then | 50 | if [ -z "$VERSION" ] ; then |
42 | echo >&2 "Please run the configure script from the top-level Makefile" | 51 | echo >&2 "Please run the configure script from the top-level Makefile" |
43 | exit 1 | 52 | exit 1 |
44 | @@ -16,8 +20,8 @@ fi | 53 | @@ -16,8 +20,8 @@ fi |
@@ -56,12 +65,12 @@ Index: pciutils-3.5.6/lib/configure | |||
56 | proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` | 65 | proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` |
57 | cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` | 66 | cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` |
58 | else | 67 | else |
59 | - cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` | 68 | - cpu=`uname -m | sed 's/^i.86-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` |
60 | + cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`} | 69 | + cpu=${4:-`uname -m | sed 's/^i.86-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`} |
61 | fi | 70 | fi |
62 | if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] | 71 | if [ "$sys" = "DragonFly" ] |
63 | then | 72 | then |
64 | @@ -35,7 +39,7 @@ if [ -z "$HOST" ] ; then | 73 | @@ -43,7 +47,7 @@ if [ -z "$HOST" ] ; then |
65 | then | 74 | then |
66 | sys=cygwin | 75 | sys=cygwin |
67 | fi | 76 | fi |
@@ -70,7 +79,7 @@ Index: pciutils-3.5.6/lib/configure | |||
70 | fi | 79 | fi |
71 | [ -n "$RELEASE" ] && rel="${RELEASE}" | 80 | [ -n "$RELEASE" ] && rel="${RELEASE}" |
72 | # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. | 81 | # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. |
73 | @@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | 82 | @@ -52,6 +56,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
74 | sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | 83 | sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
75 | echo " $host $rel $cpu $sys" | 84 | echo " $host $rel $cpu $sys" |
76 | 85 | ||