diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-06-24 21:21:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-06-24 21:21:44 +0000 |
| commit | c56511a17f8d8b37e3ff3f7a38a7deb9b6224452 (patch) | |
| tree | 8c593971e2156da2ec47a1c3e6acfeabdd39cfd2 /net-libs | |
| parent | Depend on mdds-0.9.0. (diff) | |
| download | gentoo-2-c56511a17f8d8b37e3ff3f7a38a7deb9b6224452.tar.gz gentoo-2-c56511a17f8d8b37e3ff3f7a38a7deb9b6224452.tar.bz2 gentoo-2-c56511a17f8d8b37e3ff3f7a38a7deb9b6224452.zip | |
Simplify how we install libmnl into / by letting gen_usr_ldscript do all the work. This also avoids installing an empty /lib/pkgconfig dir.
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/libmnl/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libmnl/libmnl-1.0.3-r1.ebuild | 20 |
2 files changed, 10 insertions, 16 deletions
diff --git a/net-libs/libmnl/ChangeLog b/net-libs/libmnl/ChangeLog index 15b38972425a..f1c8bb644bd4 100644 --- a/net-libs/libmnl/ChangeLog +++ b/net-libs/libmnl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libmnl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/ChangeLog,v 1.30 2013/04/29 21:16:41 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/ChangeLog,v 1.31 2013/06/24 21:21:44 vapier Exp $ + + 24 Jun 2013; Mike Frysinger <vapier@gentoo.org> libmnl-1.0.3-r1.ebuild: + Simplify how we install libmnl into / by letting gen_usr_ldscript do all the + work. This also avoids installing an empty /lib/pkgconfig dir. 29 Apr 2013; Jeroen Roovers <jer@gentoo.org> libmnl-1.0.3-r1.ebuild: Fix building with USE=-static-libs. diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild index 0ad8e731b8bb..81f5ec05db22 100644 --- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild +++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.2 2013/04/29 21:16:41 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.3 2013/06/24 21:21:43 vapier Exp $ EAPI=4 -inherit eutils multilib toolchain-funcs +inherit eutils toolchain-funcs DESCRIPTION="Minimalistic netlink library" HOMEPAGE="http://netfilter.org/projects/libmnl" @@ -16,27 +16,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="examples static-libs" src_configure() { - econf \ - $(use_enable static-libs static) \ - --libdir="${EPREFIX}"/$(get_libdir) + econf $(use_enable static-libs static) } src_install() { default - dodir /usr/$(get_libdir)/pkgconfig/ - mv "${ED}"/{,usr/}$(get_libdir)/pkgconfig/libmnl.pc || die - - if use static-libs; then - mv "${ED}"/{,usr/}$(get_libdir)/libmnl.a || die - mv "${ED}"/{,usr/}$(get_libdir)/libmnl.la || die - gen_usr_ldscript libmnl.so - fi + gen_usr_ldscript -a mnl + prune_libtool_files if use examples; then find examples/ -name 'Makefile*' -delete dodoc -r examples/ docompress -x /usr/share/doc/${PF}/examples fi - - prune_libtool_files } |