diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-01-06 11:41:28 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-01-06 11:41:28 +0000 |
| commit | 66bdebb74be461eeb9c4280f2e2121f0a2f2afbb (patch) | |
| tree | aa1e9fef198e8352974af2f030ad3b2679da5f9f /sys-apps | |
| parent | remove funky URL for HTB (diff) | |
| download | gentoo-2-66bdebb74be461eeb9c4280f2e2121f0a2f2afbb.tar.gz gentoo-2-66bdebb74be461eeb9c4280f2e2121f0a2f2afbb.tar.bz2 gentoo-2-66bdebb74be461eeb9c4280f2e2121f0a2f2afbb.zip | |
Fix linking order between libpci and zlib #160421 by Alessandro Guido.
(Portage version: 2.1.2_rc4-r6)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/pciutils/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/pciutils/files/pciutils-2.2.4-link.patch | 28 | ||||
| -rw-r--r-- | sys-apps/pciutils/pciutils-2.2.4.ebuild | 3 |
3 files changed, 35 insertions, 2 deletions
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/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() { |