francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
91 lines
2.7 KiB
Diff
91 lines
2.7 KiB
Diff
From 561216c8cbc280aaa9aecf30cb11835a4a0a78ed Mon Sep 17 00:00:00 2001
|
|
From: Richard Purdie <rpurdie@linux.intel.com>
|
|
Date: Wed, 31 Dec 2008 17:20:38 +0000
|
|
Subject: [PATCH] pciutils: Upgarde 2.2.4 -> 3.0.3
|
|
|
|
This patch:
|
|
* ensures we link correctly
|
|
* allows us to optionally pass target information to configure rather than using uname
|
|
* select linux as the platform in most cases we care about
|
|
|
|
This is a merge of various tweaks to allow us to build pciutils including
|
|
work from:
|
|
|
|
7/30/2010 - Qing He <qing.he@intel.com>
|
|
1/22/2012 - Shane Wang <shane.wang@intel.com>
|
|
Ionut Radu <ionutx.radu@intel.com>
|
|
2017/6/15 - RP - Cleanups and merging patches
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
---
|
|
Makefile | 2 +-
|
|
lib/configure | 14 ++++++++++----
|
|
2 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index aaec04e..9c1dab0 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -123,7 +123,7 @@ pcilmr$(EXEEXT): pcilmr.o $(LMROBJS) $(COMMON) lib/$(PCIIMPLIB)
|
|
pcilmr.o: pcilmr.c $(LMRINC)
|
|
|
|
%$(EXEEXT): %.o
|
|
- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
|
|
+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@
|
|
|
|
ifdef PCI_OS_WINDOWS
|
|
comma := ,
|
|
diff --git a/lib/configure b/lib/configure
|
|
index 3df057a..c87e71c 100755
|
|
--- a/lib/configure
|
|
+++ b/lib/configure
|
|
@@ -9,6 +9,10 @@ echo_n() {
|
|
printf '%s' "$*"
|
|
}
|
|
|
|
+VERSION=$1
|
|
+IDSDIR=$2
|
|
+DNS=yes
|
|
+
|
|
if [ -z "$VERSION" ] ; then
|
|
echo >&2 "Please run the configure script from the top-level Makefile"
|
|
exit 1
|
|
@@ -16,8 +20,8 @@ fi
|
|
|
|
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
|
|
@@ -25,7 +29,7 @@ if [ -z "$HOST" ] ; then
|
|
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-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
|
|
+ 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/'`}
|
|
fi
|
|
if [ "$sys" = "DragonFly" ]
|
|
then
|
|
@@ -43,7 +47,7 @@ if [ -z "$HOST" ] ; then
|
|
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.
|
|
@@ -52,6 +56,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
echo " $host $rel $cpu $sys"
|
|
|
|
+{ echo "$host" | grep linux; } && sys=linux
|
|
+
|
|
c=config.h
|
|
m=config.mk
|
|
echo >$c '#define PCI_CONFIG_H'
|