diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-06-04 03:39:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-06-04 03:39:34 +0000 |
| commit | 398f6be8cb021ffefb420d8d63cf7b7ebbbf4b5a (patch) | |
| tree | de0ac05b49a64e7c319a995703717a142a2699cf /sys-apps | |
| parent | Stable on SPARC. (diff) | |
| download | gentoo-2-398f6be8cb021ffefb420d8d63cf7b7ebbbf4b5a.tar.gz gentoo-2-398f6be8cb021ffefb420d8d63cf7b7ebbbf4b5a.tar.bz2 gentoo-2-398f6be8cb021ffefb420d8d63cf7b7ebbbf4b5a.zip | |
Dont abort if user has a known broken glibc wrt to static compilation #94879.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.00-r4.ebuild | 17 |
2 files changed, 18 insertions, 4 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 841eda526e53..1e8167078072 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.69 2005/06/03 13:55:21 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.70 2005/06/04 03:39:34 vapier Exp $ + + 04 Jun 2005; Mike Frysinger <vapier@gentoo.org> busybox-1.00-r4.ebuild: + Dont abort if user has a known broken glibc wrt to static compilation #94879. 03 Jun 2005; <solar@gentoo.org> busybox-1.00-r4.ebuild: - remove redirection of stderr to null when static linking. This will make the diff --git a/sys-apps/busybox/busybox-1.00-r4.ebuild b/sys-apps/busybox/busybox-1.00-r4.ebuild index 7498041d0a03..d192108c291e 100644 --- a/sys-apps/busybox/busybox-1.00-r4.ebuild +++ b/sys-apps/busybox/busybox-1.00-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.8 2005/06/03 22:15:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.9 2005/06/04 03:39:34 vapier Exp $ inherit eutils @@ -136,11 +136,22 @@ src_compile() { emake -j1 CROSS="${CROSS}" busybox || die "build failed" if ! use static ; then mv busybox{,.bak} + local failed=0 emake -j1 \ LDFLAGS="${LDFLAGS} -static" \ CROSS="${CROSS}" \ - busybox || die "static build failed" - mv busybox bb + busybox || failed=1 + if [[ ${failed} == 1 ]] ; then + if has_version '<sys-libs/glibc-2.3.5' ; then + eerror "Your glibc sucks, ignorning static build failure." + eerror "See http://bugs.gentoo.org/show_bug.cgi?id=94879" + cp busybox.bak bb + else + die "static build failed" + fi + else + mv busybox bb + fi mv busybox{.bak,} fi } |