pciutils: use shared library version, useful for other packages

3 files changed, 48 insertions, 20 deletions

diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 26bf7648b..3720f55f8 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -1,11 +1,11 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		pciutils
 PKG_VERSION:=		3.5.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		2bf3a4605a562fb6b8b7673bff85a474a5cf383ed7e4bd8886b4f0939013d42f
 PKG_DESCR:=		pci utilities
 PKG_SECTION:=		sys/hw
@@ -15,23 +15,24 @@ PKG_URL:=		http://www.kernel.org/pub/software/utils/pciutils/
 PKG_SITES:=		http://www.kernel.org/pub/software/utils/pciutils/
 PKG_BB:=		1
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,PCIUTILS,pciutils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PCIUTILS,pciutils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 CONFIG_STYLE:=          manual
-INSTALL_STYLE:=         manual
 
-MAKE_FLAGS+=		CC="${TARGET_CC}" \
-			CFLAGS="${TARGET_CFLAGS}" \
-			CROSS_COMPILE="${TARGET_CROSS}" \
+MAKE_FLAGS+=		CC="$(TARGET_CC)" \
+			CFLAGS="$(TARGET_CFLAGS) -fPIC" \
+			CROSS_COMPILE="$(TARGET_CROSS)" \
 			IDSDIR="/usr/share" \
-			HOST=${GNU_TARGET_NAME}
+			HOST=$(GNU_TARGET_NAME)
 ALL_TARGET:=
 
-do-install:
-	${INSTALL_DIR} ${IDIR_PCIUTILS}/usr/{share,bin}
-	${INSTALL_BIN} ${WRKBUILD}/{lspci,setpci} ${IDIR_PCIUTILS}/usr/bin
-	${INSTALL_DATA} ${WRKBUILD}/pci.ids ${IDIR_PCIUTILS}/usr/share
+pciutils-install:
+	$(INSTALL_DIR) $(IDIR_PCIUTILS)/usr/sbin
+	$(INSTALL_DIR) $(IDIR_PCIUTILS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpci*.so* $(IDIR_PCIUTILS)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/lspci $(IDIR_PCIUTILS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/setpci $(IDIR_PCIUTILS)/usr/sbin
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/pciutils/patches/patch-Makefile b/package/pciutils/patches/patch-Makefile
index 9cadfa9c2..6beca8f8d 100644
--- a/package/pciutils/patches/patch-Makefile
+++ b/package/pciutils/patches/patch-Makefile
@@ -1,6 +1,24 @@
---- pciutils-3.1.7.orig/Makefile	2010-01-31 18:42:12.000000000 +0100
-+++ pciutils-3.1.7/Makefile	2010-10-10 20:15:01.000000000 +0200
-@@ -52,7 +52,7 @@ PCIINC_INS=lib/config.h lib/header.h lib
+--- pciutils-3.5.1.orig/Makefile	2016-05-22 09:57:08.000000000 +0200
++++ pciutils-3.5.1/Makefile	2016-09-17 09:12:16.449352397 +0200
+@@ -19,7 +19,7 @@ ZLIB=
+ DNS=
+ 
+ # Build libpci as a shared library (yes/no; or local for testing; requires GCC)
+-SHARED=no
++SHARED=yes
+ 
+ # Use libkmod to resolve kernel modules on Linux (yes/no, default: detect)
+ LIBKMOD=
+@@ -32,7 +32,7 @@ HWDB=
+ ABI_VERSION=.3
+ 
+ # Installation directories
+-PREFIX=/usr/local
++PREFIX=/usr
+ SBINDIR=$(PREFIX)/sbin
+ SHAREDIR=$(PREFIX)/share
+ IDSDIR=$(SHAREDIR)
+@@ -59,7 +59,7 @@ PCIINC_INS=lib/config.h lib/header.h lib
  
  export
  
@@ -9,3 +27,12 @@
  
  lib/$(PCILIB): $(PCIINC) force
  	$(MAKE) -C lib all
+@@ -125,7 +125,7 @@ endif
+ endif
+ 
+ ifeq ($(SHARED),yes)
+-install: install-pcilib
++install: install-lib
+ endif
+ 
+ install-pcilib: lib/$(PCILIB)
diff --git a/package/pciutils/patches/patch-lib_configure b/package/pciutils/patches/patch-lib_configure
index 1c9629487..4914ae425 100644
--- a/package/pciutils/patches/patch-lib_configure
+++ b/package/pciutils/patches/patch-lib_configure
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- pciutils-3.1.7.orig/lib/configure	2009-07-04 18:11:04.000000000 +0200
-+++ pciutils-3.1.7/lib/configure	2010-10-10 20:14:17.000000000 +0200
-@@ -64,7 +64,6 @@ case $sys in
+--- pciutils-3.5.1.orig/lib/configure	2015-09-14 17:47:08.000000000 +0200
++++ pciutils-3.5.1/lib/configure	2016-09-17 09:09:30.578679773 +0200
+@@ -65,7 +65,6 @@ case $sys in
  		echo_n " sysfs proc"
  		echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS'
  		echo >>$c '#define PCI_HAVE_PM_LINUX_PROC'