[oe-commits] Frans Meulenbroeks : pciutils, fixed dynamic linking

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 416ba0769c72b443a50db6b096bae297bdb511c3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=416ba0769c72b443a50db6b096bae297bdb511c3

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Wed Feb  4 18:51:00 2009 +0100

pciutils, fixed dynamic linking

---

 packages/pciutils/pciutils-3.1.2/pciutils.patch |   20 +-------------------
 packages/pciutils/pciutils_3.1.2.bb             |    5 ++---
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/packages/pciutils/pciutils-3.1.2/pciutils.patch b/packages/pciutils/pciutils-3.1.2/pciutils.patch
index 54ed95d..c058d6e 100644
--- a/packages/pciutils/pciutils-3.1.2/pciutils.patch
+++ b/packages/pciutils/pciutils-3.1.2/pciutils.patch
@@ -1,6 +1,6 @@
 diff -urN pciutils-3.1.2.orig/lib/configure pciutils-3.1.2.new/lib/configure
 --- pciutils-3.1.2.orig/lib/configure	2009-01-30 14:06:25.000000000 +0100
-+++ pciutils-3.1.2.new/lib/configure	2009-02-04 13:30:55.000000000 +0100
++++ pciutils-3.1.2.new/lib/configure	2009-02-04 18:45:31.000000000 +0100
 @@ -14,11 +14,6 @@
  	fi
  }
@@ -13,15 +13,6 @@ diff -urN pciutils-3.1.2.orig/lib/configure pciutils-3.1.2.new/lib/configure
  echo_n "Configuring libpci for your system..."
  if [ -z "$HOST" ] ; then
  	sys=`uname -s`
-@@ -29,7 +24,7 @@
- 		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$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
-+		cpu=${5:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`}
- 	fi
- 	if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
- 	then
 @@ -44,8 +39,8 @@
  [ -n "$RELEASE" ] && rel="${RELEASE}"
  # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
@@ -33,15 +24,6 @@ diff -urN pciutils-3.1.2.orig/lib/configure pciutils-3.1.2.new/lib/configure
  echo " $host $rel $cpu $sys"
  
  c=config.h
-@@ -176,7 +171,7 @@
- else
- 	echo >>$m 'PCILIB=$(LIBNAME).so.$(VERSION)'
- 	# We link the dependencies _to_ the library, so we do not need explicit deps in .pc
--	echo >>$m 'LDLIBS='
-+	echo >>$m "LDLIBS+=$LIBRESOLV"
- 	echo >>$m 'LIB_LDLIBS=$(WITH_LIBS)'
- 	echo >>$c '#define PCI_SHARED_LIB'
- 	if [ "$SHARED" = yes ] ; then
 diff -urN pciutils-3.1.2.orig/Makefile pciutils-3.1.2.new/Makefile
 --- pciutils-3.1.2.orig/Makefile	2009-02-01 17:49:22.000000000 +0100
 +++ pciutils-3.1.2.new/Makefile	2009-02-04 13:32:50.000000000 +0100
diff --git a/packages/pciutils/pciutils_3.1.2.bb b/packages/pciutils/pciutils_3.1.2.bb
index b7e0902..26d7b51 100644
--- a/packages/pciutils/pciutils_3.1.2.bb
+++ b/packages/pciutils/pciutils_3.1.2.bb
@@ -11,9 +11,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.b
 
 PARALLEL_MAKE = ""
 
-PR ="r0"
+PR ="r1"
 
 EXTRA_OEMAKE += "'STRIP='"
+EXTRA_OEMAKE += "'SHARED=yes'"
 
 do_configure () {
 	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
@@ -24,8 +25,6 @@ export SBINDIR = "${D}${sbindir}"
 export SHAREDIR = "${D}${datadir}"
 export MANDIR = "${D}${mandir}"
 
-LDFLAGS += "-lz"
-
 do_install () {
 	oe_runmake install
 }