From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 6 Jan 2007 11:41:28 +0000 (+0000)
Subject: Fix linking order between libpci and zlib #160421 by Alessandro Guido.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f506b9b7b27b6d5606af9d3eef85be2ba873807;p=gentoo.git

Fix linking order between libpci and zlib #160421 by Alessandro Guido.
Package-Manager: portage-2.1.2_rc4-r6
---

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index e3fd3314381b..6e071be19d5c 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.88 2007/01/06 09:02:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.89 2007/01/06 11:41:27 vapier Exp $
+
+  06 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-2.2.4-link.patch, pciutils-2.2.4.ebuild:
+  Fix linking order between libpci and zlib #160421 by Alessandro Guido.
 
 *pciutils-2.2.4 (06 Jan 2007)
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 729096c2c150..e5d3d4ca0f9a 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -13,6 +13,10 @@ AUX pciutils-2.2.3-build.patch 863 RMD160 0d3841a3b7893d73a9e08e48b36552b778c022
 MD5 fbd8b592c81e7303b70e017701d30bf0 files/pciutils-2.2.3-build.patch 863
 RMD160 0d3841a3b7893d73a9e08e48b36552b778c022bd files/pciutils-2.2.3-build.patch 863
 SHA256 e05828e160524fd6df83d07520b8dc8e683eb817b48aefe78fb39c4337675cbd files/pciutils-2.2.3-build.patch 863
+AUX pciutils-2.2.4-link.patch 842 RMD160 de5c8326cbd91eeee3504efaeb48fa0283a53604 SHA1 d017c582c8db205986c794c77bd079cf1008eedd SHA256 31bde2c8ad59c5499f58b4a128f4cdc801822b1c6136d8e378be437d3933668f
+MD5 e5a27d62c39cb8c588d2cf251318ff42 files/pciutils-2.2.4-link.patch 842
+RMD160 de5c8326cbd91eeee3504efaeb48fa0283a53604 files/pciutils-2.2.4-link.patch 842
+SHA256 31bde2c8ad59c5499f58b4a128f4cdc801822b1c6136d8e378be437d3933668f files/pciutils-2.2.4-link.patch 842
 AUX pciutils.cron 39 RMD160 7dacb4dbca3f070a6d5b345789f693be90f93be2 SHA1 44a1c0e2b38e7a6cf2141177c43c8f1c0ab649a4 SHA256 22d6d2b7652cbb619cdfcc66ba3c4940a87879e4ec02873aeb87ed90117c8960
 MD5 c3b62d37547d69b21e95f35ed4c6ed7d files/pciutils.cron 39
 RMD160 7dacb4dbca3f070a6d5b345789f693be90f93be2 files/pciutils.cron 39
@@ -23,14 +27,14 @@ EBUILD pciutils-2.2.3-r2.ebuild 1105 RMD160 a62ab053b2b06a6c97fd083a547a9109ec08
 MD5 d523189f320d388c4efaebf6b7f96338 pciutils-2.2.3-r2.ebuild 1105
 RMD160 a62ab053b2b06a6c97fd083a547a9109ec0888cb pciutils-2.2.3-r2.ebuild 1105
 SHA256 8292bfde52c50795fefc8d0f14a9a6ddd3c4fd628977e94759e33614a2822efb pciutils-2.2.3-r2.ebuild 1105
-EBUILD pciutils-2.2.4.ebuild 1096 RMD160 4b6fcde9ea2d383228cfd6fb6befaa71486ae751 SHA1 34d3fed91d96231fcd2f0f1a80e7faec94196f99 SHA256 c4e44746595e48bf5a0ba3810199299b7f54c84340228b053d4bd0019bbd2911
-MD5 30c5fb911f4595f6b71716895c447549 pciutils-2.2.4.ebuild 1096
-RMD160 4b6fcde9ea2d383228cfd6fb6befaa71486ae751 pciutils-2.2.4.ebuild 1096
-SHA256 c4e44746595e48bf5a0ba3810199299b7f54c84340228b053d4bd0019bbd2911 pciutils-2.2.4.ebuild 1096
-MISC ChangeLog 11483 RMD160 b82d1fcf0efb463aa85ccb1ed3ffa2de4655b97d SHA1 b400cf81db9accdbfeeb76bb222b0b8b2d258371 SHA256 81aeb32dd38b3dabae467fa6247bfba7d604b1bddea6013039a740452a74c337
-MD5 9e4edb74b5e033216f510053057122bd ChangeLog 11483
-RMD160 b82d1fcf0efb463aa85ccb1ed3ffa2de4655b97d ChangeLog 11483
-SHA256 81aeb32dd38b3dabae467fa6247bfba7d604b1bddea6013039a740452a74c337 ChangeLog 11483
+EBUILD pciutils-2.2.4.ebuild 1142 RMD160 4bf1e0c10aac94938be03e198ffc4f692271a8e1 SHA1 b73ea6ac8b4a5f4f5f78b2ad637f5b779bc4379d SHA256 2b2951b48d571339f443a439f80f59667044b16df73be0a52a5ccfe1956a42fa
+MD5 c5c31f03ef1a7c589e9eccec6d6fe563 pciutils-2.2.4.ebuild 1142
+RMD160 4bf1e0c10aac94938be03e198ffc4f692271a8e1 pciutils-2.2.4.ebuild 1142
+SHA256 2b2951b48d571339f443a439f80f59667044b16df73be0a52a5ccfe1956a42fa pciutils-2.2.4.ebuild 1142
+MISC ChangeLog 11666 RMD160 07e8677cb2ce81e5013fdf197ffa81f9ef1adb13 SHA1 3a62772986f0fb24a8f06f6075fe9dee9a55db18 SHA256 318966f53b4c0c01f063e1cba5e65caacece6395409da770c3b48deec344737e
+MD5 ef8ac15c5d7c83f704014d436e1b00f8 ChangeLog 11666
+RMD160 07e8677cb2ce81e5013fdf197ffa81f9ef1adb13 ChangeLog 11666
+SHA256 318966f53b4c0c01f063e1cba5e65caacece6395409da770c3b48deec344737e ChangeLog 11666
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -44,7 +48,7 @@ SHA256 ae83c0072554b83b7519828f5470144cfa69ca5605ed319117d5400896258701 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFn2XI8bi6rjpTunYRArWxAJ4lQaUa4VQNakPXeen5fOLKa9+gNACeJELJ
-5yNCCyRL0QELkK/kpvAJNZk=
-=kkse
+iD8DBQFFn4r08bi6rjpTunYRArm0AJ9oS/9dgU+W/p0/7A05CV4pe9ThCACguKP+
+4213jCHFV3gda/ZG9dci7sQ=
+=wPEP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pciutils-2.2.4-link.patch b/sys-apps/pciutils/files/pciutils-2.2.4-link.patch
new file mode 100644
index 000000000000..1c3c0346301b
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-2.2.4-link.patch
@@ -0,0 +1,28 @@
+--- pciutils-2.2.4/Makefile
++++ pciutils-2.2.4/Makefile
+@@ -34,9 +34,11 @@
+ lib/config.h lib/config.mk:
+ 	cd lib && ./configure "$(IDSDIR)" "$(VERSION)" "$(HOST)" "$(RELEASE)" "$(ZLIB)"
+ 
+-pcimodules: pcimodules.o common.o $(PCILIB)
+-lspci: lspci.o common.o $(PCILIB)
+-setpci: setpci.o common.o $(PCILIB)
++pcimodules: pcimodules.o common.o
++lspci: lspci.o common.o
++setpci: setpci.o common.o
++
++lspci setpci pcimodules: LDLIBS := $(PCILIB) $(LDLIBS)
+ 
+ pcimodules.o: pcimodules.c pciutils.h $(PCIINC)
+ lspci.o: lspci.c pciutils.h $(PCIINC)
+--- pciutils-2.2.4/lib/configure
++++ pciutils-2.2.4/lib/configure
+@@ -119,7 +119,7 @@
+ if [ "$zlib" = yes ] ; then
+ 	echo >>$c '#define PCI_COMPRESSED_IDS'
+ 	echo >>$c '#define PCI_IDS "pci.ids.gz"'
+-	echo >>$m 'LDFLAGS+=-lz'
++	echo >>$m 'LDLIBS+=-lz'
+ else
+ 	echo >>$c '#define PCI_IDS "pci.ids"'
+ fi
diff --git a/sys-apps/pciutils/pciutils-2.2.4.ebuild b/sys-apps/pciutils/pciutils-2.2.4.ebuild
index 1f0f50131e9c..503fda6c646f 100644
--- a/sys-apps/pciutils/pciutils-2.2.4.ebuild
+++ b/sys-apps/pciutils/pciutils-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.4.ebuild,v 1.1 2007/01/06 09:02:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.4.ebuild,v 1.2 2007/01/06 11:41:27 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -20,6 +20,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.2.3-build.patch
 	epatch "${FILESDIR}"/pcimodules-${PN}-2.2.4.patch
+	epatch "${FILESDIR}"/${P}-link.patch #160421
 }
 
 src_compile() {