diff options
author | 2012-11-02 18:59:14 +0000 | |
---|---|---|
committer | 2012-11-02 18:59:14 +0000 | |
commit | 8634bafd4bd7c046b4b633f3aae5ed47bf87f3bf (patch) | |
tree | 0cfff33160ecc6e7ff3edb4d0d95cc877bfeb9cd /sys-apps/busybox/busybox-1.20.2.ebuild | |
parent | Update contrib extras, per bug #434098. (diff) | |
download | gentoo-2-8634bafd4bd7c046b4b633f3aae5ed47bf87f3bf.tar.gz gentoo-2-8634bafd4bd7c046b4b633f3aae5ed47bf87f3bf.tar.bz2 gentoo-2-8634bafd4bd7c046b4b633f3aae5ed47bf87f3bf.zip |
Make USE=static the default to reflect what we have always been doing (building /bin/bb statically), and depend on libselinux[static-libs] as need be #436752 by Alphat-PC.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-apps/busybox/busybox-1.20.2.ebuild')
-rw-r--r-- | sys-apps/busybox/busybox-1.20.2.ebuild | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/sys-apps/busybox/busybox-1.20.2.ebuild b/sys-apps/busybox/busybox-1.20.2.ebuild index c355a70e9f73..3c1c0d74be95 100644 --- a/sys-apps/busybox/busybox-1.20.2.ebuild +++ b/sys-apps/busybox/busybox-1.20.2.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-apps/busybox/busybox-1.20.2.ebuild,v 1.11 2012/10/20 19:39:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild,v 1.12 2012/11/02 18:59:14 vapier Exp $ EAPI="4" inherit eutils flag-o-matic savedconfig toolchain-funcs multilib @@ -57,12 +57,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static systemd" +IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static systemd" RESTRICT="test" -RDEPEND="selinux? ( sys-libs/libselinux ) +RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam )" DEPEND="${RDEPEND} + static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39" S=${WORKDIR}/${MY_P} @@ -154,9 +155,7 @@ src_configure() { if use static && use pam ; then ewarn "You cannot have USE='static pam'. Assuming static is more important." fi - use static \ - && busybox_config_option n PAM \ - || busybox_config_option pam PAM + busybox_config_option $(usex static n pam) PAM busybox_config_option static STATIC busybox_config_option systemd FEATURE_SYSTEMD busybox_config_option math FEATURE_AWK_LIBM @@ -203,18 +202,6 @@ src_compile() { export SKIP_STRIP=y emake V=1 busybox - if ! use static ; then - cp .config{,.bak} - mv busybox_unstripped{,.bak} - use pam && busybox_config_option n PAM - emake CONFIG_STATIC=y busybox - mv busybox_unstripped bb - mv busybox_unstripped{.bak,} - mv .config{.bak,} - else - # keeps src_install simpler - ln busybox_unstripped bb - fi } src_install() { @@ -226,20 +213,12 @@ src_install() { if use sep-usr ; then # install /ginit to take care of mounting stuff exeinto / - newexe bb ginit + newexe busybox_unstripped ginit dosym /ginit /bin/bb - if use static ; then - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - fi + dosym bb /bin/busybox else newbin busybox_unstripped busybox - if use static ; then - dosym busybox /bin/bb - else - dobin bb - fi + dosym busybox /bin/bb fi if use mdev ; then dodir /$(get_libdir)/mdev/ |