From b44fd9eb46c4b10ad718473c2e2a0d5cf51f56a0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 31 Dec 2006 10:58:55 +0000 Subject: [PATCH] Redo flag handling and throw out old code since it is no longer relevant #159546. Package-Manager: portage-2.1.2_rc4-r2 --- sys-apps/busybox/ChangeLog | 6 ++- sys-apps/busybox/Manifest | 22 +++++------ sys-apps/busybox/busybox-1.3.1.ebuild | 53 ++++++++++----------------- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 7e718fb311c2..feb08543c949 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +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.119 2006/12/30 18:24:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.120 2006/12/31 10:58:55 vapier Exp $ + + 31 Dec 2006; Mike Frysinger busybox-1.3.1.ebuild: + Redo flag handling and throw out old code since it is no longer relevant + #159546. 30 Dec 2006; Mike Frysinger busybox-1.3.1.ebuild: Punt USE=netboot #159490 by Maciej Grela. diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 7623ede85d4f..a793bfeda861 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -27,14 +27,14 @@ EBUILD busybox-1.2.2.1.ebuild 8397 RMD160 6e35665cbb569fb3d0c210d91e440433aa862b MD5 3bedcbbfebb81d7ed0fe15c8b9a592ff busybox-1.2.2.1.ebuild 8397 RMD160 6e35665cbb569fb3d0c210d91e440433aa862b4a busybox-1.2.2.1.ebuild 8397 SHA256 9718421ca42699dd35d17400731157942d102fb3a3f23123301a0762509a5cca busybox-1.2.2.1.ebuild 8397 -EBUILD busybox-1.3.1.ebuild 8137 RMD160 6a45b0784f9bb62da00a1e33489db5d1898cf290 SHA1 f2e7d474f523dcb843edd057f92e243c506ad193 SHA256 5a721e39af41f1658a20431fe4e3a1ab0b7270b822db7df290d86f5f04cb5c71 -MD5 a91a747cf07937490d49dde218a04e71 busybox-1.3.1.ebuild 8137 -RMD160 6a45b0784f9bb62da00a1e33489db5d1898cf290 busybox-1.3.1.ebuild 8137 -SHA256 5a721e39af41f1658a20431fe4e3a1ab0b7270b822db7df290d86f5f04cb5c71 busybox-1.3.1.ebuild 8137 -MISC ChangeLog 19067 RMD160 4bfd1566a65971f0beedf7335634b01ac7e996e0 SHA1 90377bc2667973b365a5c3084dee3479750935b7 SHA256 5f4b8abc5efea730b68204abd8a600d01e40aefcd9344cd78f11a03742471a08 -MD5 031aff1d948137cefc7d21436b4d78bc ChangeLog 19067 -RMD160 4bfd1566a65971f0beedf7335634b01ac7e996e0 ChangeLog 19067 -SHA256 5f4b8abc5efea730b68204abd8a600d01e40aefcd9344cd78f11a03742471a08 ChangeLog 19067 +EBUILD busybox-1.3.1.ebuild 7838 RMD160 6ae09f2db9703d5440250ec7fd487bf9401f6e6b SHA1 5ce750a62f346462253728d06796588e2832b5db SHA256 dcd7d5f617633823b2bbee11e3ce685c42c553deab468ce128bc0a01dca47ac7 +MD5 8a594c17267fa5c577e4f61244e8a7d9 busybox-1.3.1.ebuild 7838 +RMD160 6ae09f2db9703d5440250ec7fd487bf9401f6e6b busybox-1.3.1.ebuild 7838 +SHA256 dcd7d5f617633823b2bbee11e3ce685c42c553deab468ce128bc0a01dca47ac7 busybox-1.3.1.ebuild 7838 +MISC ChangeLog 19226 RMD160 756eb736171c5ef30955a176e3b7b51ec51a0b64 SHA1 a27946d28d31b0a0dbbbbc37ed26437eeba2f9d9 SHA256 7a1a578f71cf25dbd454c4782229333dac7035fd6dcd628c5c3c250834fcdb98 +MD5 681e6e9fc4f7db82a5352244f9cb6f80 ChangeLog 19226 +RMD160 756eb736171c5ef30955a176e3b7b51ec51a0b64 ChangeLog 19226 +SHA256 7a1a578f71cf25dbd454c4782229333dac7035fd6dcd628c5c3c250834fcdb98 ChangeLog 19226 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161 @@ -48,7 +48,7 @@ SHA256 b06e896a90e122006f6ab811e6fb2f6c08ffe36693c93271e4e1c7bcb82af939 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFlq8q8bi6rjpTunYRAuvwAJ9/wPJhvYN8L0e+rhCb6jjyTAXTVACfZg0X -EXoQ/75T0atoDTwn1icALxo= -=g199 +iD8DBQFFl5g08bi6rjpTunYRAghCAKDW1C+uF9thZM2Eue2bwO4naIf5JgCfTERP +VLY7+4AFvwO7DX8RxjRYoRE= +=7eZC -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.3.1.ebuild b/sys-apps/busybox/busybox-1.3.1.ebuild index d530b5eb6de3..ddb699da9340 100644 --- a/sys-apps/busybox/busybox-1.3.1.ebuild +++ b/sys-apps/busybox/busybox-1.3.1.ebuild @@ -1,6 +1,6 @@ # 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.3.1.ebuild,v 1.3 2006/12/30 18:24:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.3.1.ebuild,v 1.4 2006/12/31 10:58:55 vapier Exp $ inherit eutils flag-o-matic @@ -73,12 +73,6 @@ S=${WORKDIR}/${MY_P} # then eventually turning on selinux would mean # adding a dep: selinux? ( sys-libs/libselinux ) -busybox_set_env() { - type -p ${CHOST}-ar > /dev/null && export CROSS=${CHOST}- - # Don't let KBUILD_OUTPUT mess us up #88088 - unset KBUILD_OUTPUT -} - busybox_config_option() { case $1 in y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;; @@ -93,14 +87,25 @@ busybox_config_option() { } src_unpack() { - busybox_set_env + unset KBUILD_OUTPUT #88088 + unpack ${A} cd "${S}" # patches go here! epatch "${FILESDIR}"/1.3.0/bb.patch epatch "${FILESDIR}"/1.3.0/ld.patch - sed -i 's: -Werror : :' Makefile.flags + + # work around broken ass powerpc compilers + use ppc64 && append-flags -mminimal-toc + # flag cleanup + sed -i \ + -e 's: -Werror : :' \ + -e 's:-Os -falign-functions=1 -falign-jumps=1 -falign-loops=1::' \ + -e 's:-fomit-frame-pointer::' \ + Makefile.flags + sed -i "/^CFLAGS.*:=/s:$: ${CFLAGS}:" Makefile + echo "CROSS_COMPILE := ${CHOST}-" >> Makefile.flags # check for a busybox config before making one of our own. # if one exist lets return and use it. @@ -160,37 +165,19 @@ src_unpack() { } src_compile() { - busybox_set_env - - # work around broken ass powerpc compilers - use ppc64 && append-flags -mminimal-toc + unset KBUILD_OUTPUT #88088 - emake CROSS="${CROSS}" EXTRA_CFLAGS="${CFLAGS}" busybox || die "build failed" + emake busybox || die "build failed" if ! use static ; then mv busybox_unstripped{,.bak} - local failed=0 - LDFLAGS="${LDFLAGS} -static" \ - emake \ - CROSS="${CROSS}" \ - EXTRA_CFLAGS="${CFLAGS}" \ - busybox || failed=1 - if [[ ${failed} == 1 ]] ; then - if has_version '