From 9ae4dc6c4d324e9eed519559e979b368a5f84263 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Nov 2012 07:31:39 +0000 Subject: Run elibtoolize for cross-compile relinking, and use get_libdir when deleting .la files. (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) --- dev-libs/libnl/ChangeLog | 6 +++++- dev-libs/libnl/libnl-3.2.14.ebuild | 13 +++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'dev-libs/libnl') diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog index 5f9c90c1c8c5..37348ed3a46f 100644 --- a/dev-libs/libnl/ChangeLog +++ b/dev-libs/libnl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libnl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.110 2012/10/26 02:18:02 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.111 2012/11/07 07:31:39 vapier Exp $ + + 07 Nov 2012; Mike Frysinger libnl-3.2.14.ebuild: + Run elibtoolize for cross-compile relinking, and use get_libdir when deleting + .la files. 26 Oct 2012; Anthony G. Basile libnl-3.2.14.ebuild: keyword ~mips diff --git a/dev-libs/libnl/libnl-3.2.14.ebuild b/dev-libs/libnl/libnl-3.2.14.ebuild index 88c625a79e95..b6fc1847440d 100644 --- a/dev-libs/libnl/libnl-3.2.14.ebuild +++ b/dev-libs/libnl/libnl-3.2.14.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.14.ebuild,v 1.2 2012/10/26 02:18:02 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.14.ebuild,v 1.3 2012/11/07 07:31:39 vapier Exp $ EAPI=4 -inherit eutils multilib +inherit eutils libtool multilib DESCRIPTION="A library for applications dealing with netlink socket" HOMEPAGE="http://www.infradead.org/~tgr/libnl/" @@ -22,8 +22,8 @@ DEPEND=" " src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.1-vlan-header.patch + elibtoolize + epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch } src_configure() { @@ -39,12 +39,9 @@ src_install() { dohtml -r \ -a css,html,js,map,png \ "${WORKDIR}"/${PN}-doc-${PV} - fi - if ! use static-libs; then - rm -f "${D}"/usr/lib*/lib*.la - fi + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.la dodoc ChangeLog } -- cgit v1.2.3-65-gdbad