diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-10-03 20:42:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-10-03 20:42:02 +0000 |
| commit | d09c289d82c1269e47c39042516522f0d83a6c90 (patch) | |
| tree | c77383949dcb720d8f72d7eb361688a08daf28ef /sys-libs/libselinux | |
| parent | fix dependencies, add ruby19 (diff) | |
| download | gentoo-2-d09c289d82c1269e47c39042516522f0d83a6c90.tar.gz gentoo-2-d09c289d82c1269e47c39042516522f0d83a6c90.tar.bz2 gentoo-2-d09c289d82c1269e47c39042516522f0d83a6c90.zip | |
Fix /usr/lib handling in utils subdir too.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/libselinux')
| -rw-r--r-- | sys-libs/libselinux/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/libselinux/libselinux-2.1.9-r2.ebuild | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog index 2fb4d2361b72..356cef9c1874 100644 --- a/sys-libs/libselinux/ChangeLog +++ b/sys-libs/libselinux/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/libselinux # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.84 2012/09/08 18:44:22 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.85 2012/10/03 20:42:02 vapier Exp $ + + 03 Oct 2012; Mike Frysinger <vapier@gentoo.org> libselinux-2.1.9-r2.ebuild: + Fix /usr/lib handling in utils subdir too. *libselinux-2.1.9-r2 (08 Sep 2012) diff --git a/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild b/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild index 55c92fa6ee30..52f5540122d4 100644 --- a/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild +++ b/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild,v 1.1 2012/09/08 18:44:22 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild,v 1.2 2012/10/03 20:42:02 vapier Exp $ EAPI="4" PYTHON_DEPEND="python? *" @@ -46,10 +46,10 @@ src_unpack() { src_prepare() { # fix up paths for multilib - sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \ - || die "Fix for multilib LIBDIR failed." - sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \ - || die "Fix for multilib SHLIBDIR failed." + sed -i \ + -e "/^LIBDIR/s/lib/$(get_libdir)/" \ + -e "/^SHLIBDIR/s/lib/$(get_libdir)/" \ + src/Makefile utils/Makefile || die epatch "${FILESDIR}/${P}-mountsys.patch" } |