diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-03-27 22:57:43 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-03-27 22:57:43 +0000 |
| commit | 2cdaa914681c1e96358ff2dc5d3db97caaa3668a (patch) | |
| tree | 5a39cbf1331dd20936ee903a6000a7214ea5e3f2 /sys-fs/eudev | |
| parent | fix for bug 505980 CVE-2014-0056 (diff) | |
| download | gentoo-2-2cdaa914681c1e96358ff2dc5d3db97caaa3668a.tar.gz gentoo-2-2cdaa914681c1e96358ff2dc5d3db97caaa3668a.tar.bz2 gentoo-2-2cdaa914681c1e96358ff2dc5d3db97caaa3668a.zip | |
Install multilib libgudev, bug #506002
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'sys-fs/eudev')
| -rw-r--r-- | sys-fs/eudev/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/eudev/eudev-9999.ebuild | 25 |
2 files changed, 19 insertions, 11 deletions
diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog index e5bb540030b9..660a5a6b7532 100644 --- a/sys-fs/eudev/ChangeLog +++ b/sys-fs/eudev/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/eudev # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.94 2014/03/22 23:29:39 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.95 2014/03/27 22:57:43 blueness Exp $ + + 27 Mar 2014; Anthony G. Basile <blueness@gentoo.org> eudev-9999.ebuild: + Install multilib libgudev, bug #506002 *eudev-1.5.3 (22 Mar 2014) diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild index f6cfa2e80cc6..b0eaabb132db 100644 --- a/sys-fs/eudev/eudev-9999.ebuild +++ b/sys-fs/eudev/eudev-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.43 2014/01/25 17:27:51 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.44 2014/03/27 22:57:43 blueness Exp $ EAPI="5" @@ -24,7 +24,7 @@ LICENSE="LGPL-2.1 MIT GPL-2" SLOT="0" IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test" -COMMON_DEPEND="gudev? ( dev-libs/glib:2 ) +COMMON_DEPEND="gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) @@ -135,6 +135,8 @@ multilib_src_configure() --with-html-dir="/usr/share/doc/${PF}/html" --enable-split-usr --exec-prefix=/ + + $(use_enable gudev) ) # Only build libudev for non-native_abi, and only install it to libdir, @@ -142,7 +144,6 @@ multilib_src_configure() if multilib_build_binaries; then econf_args+=( --with-rootlibdir=/$(get_libdir) $(use_enable doc gtk-doc) - $(use_enable gudev) $(use_enable introspection) $(use_enable keymap) $(use_enable kmod libkmod) @@ -152,7 +153,7 @@ multilib_src_configure() $(use_enable rule-generator) ) else econf_args+=( - $(echo --disable-{gtk-doc,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator}) + $(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator}) ) fi ECONF_SOURCE="${S}" econf "${econf_args[@]}" @@ -160,18 +161,22 @@ multilib_src_configure() multilib_src_compile() { - if ! multilib_build_binaries; then - cd src/libudev || die "Could not change directory" + if multilib_build_binaries; then + emake + else + emake -C src/libudev + emake -C src/gudev fi - emake } multilib_src_install() { - if ! multilib_build_binaries; then - cd src/libudev || die "Could not change directory" + if multilib_build_binaries; then + emake DESTDIR="${D}" install + else + emake -C src/libudev DESTDIR="${D}" install + emake -C src/gudev DESTDIR="${D}" install fi - emake DESTDIR="${D}" install } multilib_src_test() |