diff options
| author |   Ned Ludd <solar@gentoo.org> | 2006-07-10 17:54:07 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2006-07-10 17:54:07 +0000 |
| commit | 62d5d3490c20afac676fdeefbb65510d98c9ef51 (patch) | |
| tree | 4fcf4a9d6e006e9e6198b531f7c54c8c45b9e19c /sys-apps/busybox | |
| parent | Fixing perl-app/module inherits (diff) | |
| download | gentoo-2-62d5d3490c20afac676fdeefbb65510d98c9ef51.tar.gz gentoo-2-62d5d3490c20afac676fdeefbb65510d98c9ef51.tar.bz2 gentoo-2-62d5d3490c20afac676fdeefbb65510d98c9ef51.zip | |
- ppc32/ppc64 fails to compile busybox when using ssp. ICE ICE baby!
(Portage version: 2.1-r1)
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.1.3.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.2.0.ebuild | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 73f00bf6a120..1942ba236673 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,10 +1,10 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.100 2006/07/09 11:18:54 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.101 2006/07/10 17:54:07 solar Exp $ - 09 Jul 2006; <solar@gentoo.org> busybox-1.1.3.ebuild, + 10 Jul 2006; <solar@gentoo.org> busybox-1.1.3.ebuild, busybox-1.2.0.ebuild: - - ppc32/ppc64 fail to compile busybox when using -pie so auto enable nopie + - ppc32/ppc64 fails to compile busybox when using ssp. 09 Jul 2006; Joshua Kinard <kumba@gentoo.org> busybox-1.1.3.ebuild: Marked stable on mips. diff --git a/sys-apps/busybox/busybox-1.1.3.ebuild b/sys-apps/busybox/busybox-1.1.3.ebuild index bb319952f524..5579a6f0e93f 100644 --- a/sys-apps/busybox/busybox-1.1.3.ebuild +++ b/sys-apps/busybox/busybox-1.1.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.3.ebuild,v 1.10 2006/07/09 11:18:54 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.3.ebuild,v 1.11 2006/07/10 17:54:07 solar Exp $ -inherit eutils +inherit eutils flag-o-matic #SNAPSHOT=20040726 SNAPSHOT="" @@ -126,8 +126,8 @@ src_unpack() { src_compile() { busybox_set_env - use ppc64 && CFLAGS="${CFLAGS} -mminimal-toc -nopie" - use ppc && CFLAGS="${CFLAGS} -nopie" + use ppc64 && CFLAGS="${CFLAGS} -mminimal-toc `test-flags-CC -fno-stack-protector`" + use ppc && CFLAGS="${CFLAGS} `test-flags-CC -fno-stack-protector`" emake CROSS="${CROSS}" busybox || die "build failed" if ! use static ; then mv busybox_unstripped{,.bak} diff --git a/sys-apps/busybox/busybox-1.2.0.ebuild b/sys-apps/busybox/busybox-1.2.0.ebuild index 0d6afe5857eb..0f045df907b3 100644 --- a/sys-apps/busybox/busybox-1.2.0.ebuild +++ b/sys-apps/busybox/busybox-1.2.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.0.ebuild,v 1.2 2006/07/09 11:18:54 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.0.ebuild,v 1.3 2006/07/10 17:54:07 solar Exp $ -inherit eutils +inherit eutils flag-o-matic #SNAPSHOT=20040726 SNAPSHOT="" @@ -126,8 +126,8 @@ src_unpack() { src_compile() { busybox_set_env - use ppc64 && CFLAGS="${CFLAGS} -mminimal-toc -nopie" - use ppc && CFLAGS="${CFLAGS} -nopie" + use ppc64 && CFLAGS="${CFLAGS} -mminimal-toc `test-flags-CC -fno-stack-protector`" + use ppc && CFLAGS="${CFLAGS} `test-flags-CC -fno-stack-protector`" emake CROSS="${CROSS}" busybox || die "build failed" if ! use static ; then mv busybox_unstripped{,.bak} |