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 | 74c6a337217641dad3f5752dc4204e32ff7fe693 (patch) | |
| tree | 7f56f65538082ebf1d61984055b99ee59e2618bd /sys-apps/busybox | |
| parent | Stable on SPARC. (diff) | |
| download | historical-74c6a337217641dad3f5752dc4204e32ff7fe693.tar.gz historical-74c6a337217641dad3f5752dc4204e32ff7fe693.tar.bz2 historical-74c6a337217641dad3f5752dc4204e32ff7fe693.zip | |
Dont abort if user has a known broken glibc wrt to static compilation #94879.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/busybox/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.00-r4.ebuild | 17 |
3 files changed, 20 insertions, 6 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/Manifest b/sys-apps/busybox/Manifest index 12069b5f606e..470bf284a98d 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,9 +1,9 @@ -MD5 0ade6284270598ea4c5161ab6ba187c8 ChangeLog 13137 +MD5 18b44cd9a981873f45feeca0f9f94da4 ChangeLog 13293 MD5 bb8e7d385422646c5c1de481e9ebe3d7 busybox-1.00-r2.ebuild 6186 MD5 65f9d58ae4d54a1521081a2e15f3b66b busybox-1.00-r1.ebuild 6082 MD5 1fe139692f8bffc43b4d01249289b358 busybox-1.00-r3.ebuild 6473 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 -MD5 2ef38ab1045e1fa753f005f755fdb189 busybox-1.00-r4.ebuild 6513 +MD5 806816408a0b7acd161286dad378705a busybox-1.00-r4.ebuild 6799 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r2 66 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r3 66 MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142 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 } |