diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-11-16 12:14:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-11-16 12:14:41 +0000 |
| commit | e51d5ffcadc1eb0e5fd50a0daaf0be456dd1aead (patch) | |
| tree | 9640ebcc8c08e3e288d04e16a11277a137e6b7d9 /sys-apps/busybox | |
| parent | amd64 stable, bug #339424 (diff) | |
| download | gentoo-2-e51d5ffcadc1eb0e5fd50a0daaf0be456dd1aead.tar.gz gentoo-2-e51d5ffcadc1eb0e5fd50a0daaf0be456dd1aead.tar.bz2 gentoo-2-e51d5ffcadc1eb0e5fd50a0daaf0be456dd1aead.zip | |
Disable USE=pam when building the static rescue shell #345665 by Paweł Hajdan jr.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.17.1-r1.ebuild | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index cc8b54cecb1e..0de867e1fe6f 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.256 2010/09/28 16:53:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.257 2010/11/16 12:14:41 vapier Exp $ + + 16 Nov 2010; Mike Frysinger <vapier@gentoo.org> busybox-1.17.1-r1.ebuild: + Disable USE=pam when building the static rescue shell #345665 by Paweł + Hajdan jr. 28 Sep 2010; Mike Frysinger <vapier@gentoo.org> busybox-1.17.1-r1.ebuild, +files/busybox-1.17.1-date.patch, +files/busybox-1.17.1-grep.patch: diff --git a/sys-apps/busybox/busybox-1.17.1-r1.ebuild b/sys-apps/busybox/busybox-1.17.1-r1.ebuild index cfc174ca28e4..9121abc8b661 100644 --- a/sys-apps/busybox/busybox-1.17.1-r1.ebuild +++ b/sys-apps/busybox/busybox-1.17.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v 1.2 2010/09/28 16:53:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.17.1-r1.ebuild,v 1.3 2010/11/16 12:14:41 vapier Exp $ EAPI=2 inherit eutils flag-o-matic savedconfig toolchain-funcs @@ -177,11 +177,14 @@ src_compile() { export SKIP_STRIP=y emake busybox || die "build failed" - if ! use static && ! use pam ; then + if ! use static ; then + cp .config{,.bak} mv busybox_unstripped{,.bak} + use pam && busybox_config_option n PAM emake CONFIG_STATIC=y busybox || die "static build failed" mv busybox_unstripped bb mv busybox_unstripped{.bak,} + mv .config{.bak,} fi } |