Unconditionally use -fPIC for libs (#55238).

4 files changed, 86 insertions, 4 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index f8837a13e99d..a67748543fb3 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.33 2004/07/26 14:57:27 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.34 2004/08/30 13:49:36 gmsoft Exp $
+
+*pciutils-2.1.11-r2 (30 Aug 2004)
+
+  30 Aug 2004; Guy Martin <gmsoft@gentoo.org> +pciutils-2.1.11-r2.ebuild:
+  Unconditionally use -fPIC for libs (#55238).
 
   26 Jul 2004; <solar@gentoo.org> pciutils-2.1.11-r1.ebuild:
   fix command line overflow which did not allow for null terminator when using
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 83d75bddb63d..80ff500f89a5 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,8 +1,10 @@
-MD5 f1c5179d76ba2c4a8424154e76b86a46 pciutils-2.1.11-r1.ebuild 1662
-MD5 a715840d9c61913486ef33b98fdf654c pciutils-2.1.11.ebuild 1248
 MD5 c4693423d71f08e0c81042a775a5e71f ChangeLog 4389
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
+MD5 f1c5179d76ba2c4a8424154e76b86a46 pciutils-2.1.11-r1.ebuild 1662
+MD5 a715840d9c61913486ef33b98fdf654c pciutils-2.1.11.ebuild 1248
+MD5 c31e62dc02a0e76979d80dac7e15eb73 pciutils-2.1.11-r2.ebuild 1723
 MD5 1532c4c74daf454495048467b2a8b04b files/2.1.11-sysfs.patch 10425
 MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11 67
 MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r1 67
+MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
+MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r2 67
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.11-r2 b/sys-apps/pciutils/files/digest-pciutils-2.1.11-r2
new file mode 100644
index 000000000000..5bab57abb8f5
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.1.11-r2
@@ -0,0 +1 @@
+MD5 1d40f90aaae69594790bdb8ff90b4a41 pciutils-2.1.11.tar.gz 120948
diff --git a/sys-apps/pciutils/pciutils-2.1.11-r2.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r2.ebuild
new file mode 100644
index 000000000000..26b1b2887fb6
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.1.11-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r2.ebuild,v 1.1 2004/08/30 13:49:36 gmsoft Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE=""
+
+DEPEND="virtual/libc
+	net-misc/wget"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/pcimodules-${P}.diff
+	epatch ${FILESDIR}/${PV}-sysfs.patch #38645
+
+
+	# Unconditionally use -fPIC for libs (#55238)
+	sed -i \
+		-e "/^include/s/$/\nCFLAGS+=-fPIC/" lib/Makefile \
+		|| die "sed lib/Makefile failed"
+
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" Makefile \
+		|| die "sed Makefile failed"
+
+	# fix command line overflow which did not allow for null terminator
+	# when using  lspci -vvv (AGPx1 and AGPx2 and AGPx4) bug #41422
+	sed -i -e s/'rate\[8\]'/'rate\[9\]'/g lspci.c \
+		|| die "sed failed on lspci.c"
+
+	./update-pciids.sh
+}
+
+src_compile() {
+	emake PREFIX=/usr lib || die "emake lib failed"
+
+	cd ${S}/lib
+	sed -i \
+		-e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" config.h \
+		|| die "sed config.h failed"
+
+	cd ${S}
+	emake PREFIX=/usr || die "emake failed"
+
+	sed -i \
+		-e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" \
+		update-pciids lspci.8 update-pciids.8 \
+		|| die "sed failed"
+}
+
+src_install() {
+	into /
+	dosbin setpci lspci pcimodules update-pciids || die "dosbin failed"
+	doman *.8
+
+	insinto /usr/share/misc
+	doins pci.ids || die
+
+	into /usr
+	dolib lib/libpci.a
+
+	insinto /usr/include/pci
+	doins lib/*.h
+}