diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-08-02 00:29:29 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-08-02 00:29:29 +0000 |
| commit | e7d81e2345c9af0539ef4ca327d91aeca5e50425 (patch) | |
| tree | 36e99eeae8d8442760d8021e2982faaf7fcbaef6 /sys-fs | |
| parent | Linux patch 3.14.15 (diff) | |
| download | gentoo-2-e7d81e2345c9af0539ef4ca327d91aeca5e50425.tar.gz gentoo-2-e7d81e2345c9af0539ef4ca327d91aeca5e50425.tar.bz2 gentoo-2-e7d81e2345c9af0539ef4ca327d91aeca5e50425.zip | |
Migrate src_configure() over to multilib_native_use_enable() function from multilib-build.eclass
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 42 |
2 files changed, 17 insertions, 31 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index aec6a23cbeca..c01c47ce7b2c 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1080 2014/08/01 15:36:32 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1081 2014/08/02 00:29:29 ssuominen Exp $ + + 02 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild: + Migrate src_configure() over to multilib_native_use_enable() function from + multilib-build.eclass 01 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> udev-215-r1.ebuild: Include more straightforward patch for the last commit after all wrt diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 051168a81cbb..c85ab13397bf 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-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/udev/udev-9999.ebuild,v 1.315 2014/08/01 09:22:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.316 2014/08/02 00:29:29 ssuominen Exp $ EAPI=5 @@ -160,12 +160,18 @@ multilib_src_configure() { ac_cv_search_cap_init= --libdir=/usr/$(get_libdir) --docdir=/usr/share/doc/${PF} + $(multilib_native_use_enable static-libs static) --disable-nls + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable introspection) --disable-python-devel --disable-dbus + $(multilib_native_use_enable kmod) --disable-seccomp + $(multilib_native_use_enable selinux) --disable-xz --disable-pam + $(multilib_native_use_enable acl) --disable-gcrypt --disable-audit --disable-libcryptsetup @@ -176,44 +182,20 @@ multilib_src_configure() { --disable-quotacheck --disable-logind --disable-polkit - --disable-nls --disable-myhostname $(use_enable gudev) + $(multilib_is_native_abi || echo "--disable-manpages") --enable-split-usr --with-html-dir=/usr/share/doc/${PF}/html --without-python --with-bashcompletiondir="$(get_bashcompdir)" + $(use firmware-loader && echo "--with-firmware-path=/lib/firmware/updates:/lib/firmware") --with-rootprefix= + $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)") ) + # Use pregenerated copies when possible wrt #480924 - if ! [[ ${PV} = 9999* ]]; then - econf_args+=( - --disable-manpages - ) - fi - if multilib_is_native_abi; then - econf_args+=( - $(use_enable static-libs static) - $(use_enable doc gtk-doc) - $(use_enable introspection) - $(use_enable acl) - $(use_enable kmod) - $(use_enable selinux) - --with-rootlibdir=/$(get_libdir) - ) - else - econf_args+=( - --disable-static - --disable-gtk-doc - --disable-introspection - --disable-acl - --disable-kmod - --disable-selinux - --disable-manpages - --with-rootlibdir=/usr/$(get_libdir) - ) - fi - use firmware-loader && econf_args+=( --with-firmware-path="/lib/firmware/updates:/lib/firmware" ) + [[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages ) ECONF_SOURCE=${S} econf "${econf_args[@]}" } |