diff options
Diffstat (limited to 'meta/recipes-bsp/pciutils/pciutils/configure.patch')
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils/configure.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch deleted file mode 100644 index e444c13975..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | This patch: | ||
2 | * ensures we link correctly | ||
3 | * 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 | ||
5 | |||
6 | This is a merge of various tweaks to allow us to build pciutils including | ||
7 | work from: | ||
8 | |||
9 | 7/30/2010 - Qing He <qing.he@intel.com> | ||
10 | 1/22/2012 - Shane Wang <shane.wang@intel.com> | ||
11 | Ionut Radu <ionutx.radu@intel.com> | ||
12 | 2017/6/15 - RP - Cleanups and merging patches | ||
13 | |||
14 | Upstream-Status: Inappropriate [embedded specific] | ||
15 | |||
16 | Index: pciutils-3.5.6/Makefile | ||
17 | =================================================================== | ||
18 | --- pciutils-3.5.6.orig/Makefile | ||
19 | +++ pciutils-3.5.6/Makefile | ||
20 | @@ -96,7 +96,7 @@ example: example.o lib/$(PCILIB) | ||
21 | example.o: example.c $(PCIINC) | ||
22 | |||
23 | %: %.o | ||
24 | - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ | ||
25 | + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ | ||
26 | |||
27 | %.8 %.7 %.5: %.man | ||
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)#" | ||
29 | Index: pciutils-3.5.6/lib/configure | ||
30 | =================================================================== | ||
31 | --- pciutils-3.5.6.orig/lib/configure | ||
32 | +++ pciutils-3.5.6/lib/configure | ||
33 | @@ -9,6 +9,10 @@ echo_n() { | ||
34 | printf '%s' "$*" | ||
35 | } | ||
36 | |||
37 | +VERSION=$1 | ||
38 | +IDSDIR=$2 | ||
39 | +DNS=yes | ||
40 | + | ||
41 | if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then | ||
42 | echo >&2 "Please run the configure script from the top-level Makefile" | ||
43 | exit 1 | ||
44 | @@ -16,8 +20,8 @@ fi | ||
45 | |||
46 | echo_n "Configuring libpci for your system..." | ||
47 | if [ -z "$HOST" ] ; then | ||
48 | - sys=`uname -s` | ||
49 | - rel=`uname -r` | ||
50 | + sys=${3:-`uname -s`} | ||
51 | + rel= | ||
52 | realsys="$sys" | ||
53 | if [ "$sys" = "AIX" -a -x /usr/bin/oslevel -a -x /usr/sbin/lsattr ] | ||
54 | then | ||
55 | @@ -25,7 +29,7 @@ if [ -z "$HOST" ] ; then | ||
56 | 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/_.*//'` | ||
58 | 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/'` | ||
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/'`} | ||
61 | fi | ||
62 | if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] | ||
63 | then | ||
64 | @@ -35,7 +39,7 @@ if [ -z "$HOST" ] ; then | ||
65 | then | ||
66 | sys=cygwin | ||
67 | fi | ||
68 | - HOST=${3:-$cpu-$sys} | ||
69 | + HOST=$cpu-$sys | ||
70 | fi | ||
71 | [ -n "$RELEASE" ] && rel="${RELEASE}" | ||
72 | # 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/'` | ||
74 | sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
75 | echo " $host $rel $cpu $sys" | ||
76 | |||
77 | +{ echo "$host" | grep linux; } && sys=linux | ||
78 | + | ||
79 | c=config.h | ||
80 | m=config.mk | ||
81 | echo >$c '#define PCI_CONFIG_H' | ||