From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 28 Mar 2007 06:00:19 +0000 (+0000)
Subject: set the config static flag on the cmdline rather than forcing LDFLAGS #160879
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ada254a8f18284b88130639f9d385c26b56bc61;p=gentoo.git

set the config static flag on the cmdline rather than forcing LDFLAGS #160879
Package-Manager: portage-2.1.2.2
---

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index cef2957620c1..af71c28105d5 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -59,18 +59,18 @@ EBUILD busybox-1.4.1-r1.ebuild 8242 RMD160 26991c92f984f14a0bb9648148f59b00a1f7e
 MD5 f81ea3f600826d2b1808c82ce3ca23d0 busybox-1.4.1-r1.ebuild 8242
 RMD160 26991c92f984f14a0bb9648148f59b00a1f7eadc busybox-1.4.1-r1.ebuild 8242
 SHA256 62b73f790869faa0e5e7904341cda3f68a476ebadf49bac564adf7b29627127b busybox-1.4.1-r1.ebuild 8242
-EBUILD busybox-1.4.1-r2.ebuild 8330 RMD160 0a887b2115a709da1c636d35fac4624c0714a010 SHA1 5d15e868bc3f76dd00380fa3c967125b21172b1f SHA256 0df50b384da412efba178d9f3b03c014afe7d30fc05380bbaa0f2615ccd48ace
-MD5 da971d9b6dbda31043087397a98d283e busybox-1.4.1-r2.ebuild 8330
-RMD160 0a887b2115a709da1c636d35fac4624c0714a010 busybox-1.4.1-r2.ebuild 8330
-SHA256 0df50b384da412efba178d9f3b03c014afe7d30fc05380bbaa0f2615ccd48ace busybox-1.4.1-r2.ebuild 8330
-EBUILD busybox-1.4.2.ebuild 8244 RMD160 2c4e5c1924209f76ff2d8f5dd861b05305207c38 SHA1 b514c85df11fc0f784ee54b86bc33605c66cfa82 SHA256 e597d21d5146fbe17fefec1d94eca8d6d457e6b24fac118f4eaf4939887e7f2b
-MD5 4879210b629d01da8038ae6937bbeb92 busybox-1.4.2.ebuild 8244
-RMD160 2c4e5c1924209f76ff2d8f5dd861b05305207c38 busybox-1.4.2.ebuild 8244
-SHA256 e597d21d5146fbe17fefec1d94eca8d6d457e6b24fac118f4eaf4939887e7f2b busybox-1.4.2.ebuild 8244
-EBUILD busybox-1.5.0.ebuild 8198 RMD160 c8ab9bade0c1b8dc61c7e3a01cfea7012d5333d9 SHA1 c2d2ec70a086a7c1c3f6a03276c018d055fc3576 SHA256 777a01eb0aa0da37adcc9771c22feff4cd333d8c6b321d53df96a29db6527217
-MD5 30e1cf1a19402e97c7f388d664424798 busybox-1.5.0.ebuild 8198
-RMD160 c8ab9bade0c1b8dc61c7e3a01cfea7012d5333d9 busybox-1.5.0.ebuild 8198
-SHA256 777a01eb0aa0da37adcc9771c22feff4cd333d8c6b321d53df96a29db6527217 busybox-1.5.0.ebuild 8198
+EBUILD busybox-1.4.1-r2.ebuild 8317 RMD160 addb0c7977515eb1a421ccc7de874fdf3ea6a7a2 SHA1 847ba260c9d5c5f55672c194774c508fec557adb SHA256 2d888a20ad05612dc3b034b646872b8d1edf7979afbbacec31e46a02cafbfd92
+MD5 cdc2033a1cd7570fccf5b14e3c9b3ae7 busybox-1.4.1-r2.ebuild 8317
+RMD160 addb0c7977515eb1a421ccc7de874fdf3ea6a7a2 busybox-1.4.1-r2.ebuild 8317
+SHA256 2d888a20ad05612dc3b034b646872b8d1edf7979afbbacec31e46a02cafbfd92 busybox-1.4.1-r2.ebuild 8317
+EBUILD busybox-1.4.2.ebuild 8231 RMD160 efcff48bb3ba52b19e6c7565d4ff395803f73c70 SHA1 b86cca5e98604fce17749bdfdb63a963523d0855 SHA256 21e65865a9a01a119316361e3014652cef56cac6d35da09636cbfa62a9871f74
+MD5 66920a7fcbd5cbf9f2bf8e7e167cd693 busybox-1.4.2.ebuild 8231
+RMD160 efcff48bb3ba52b19e6c7565d4ff395803f73c70 busybox-1.4.2.ebuild 8231
+SHA256 21e65865a9a01a119316361e3014652cef56cac6d35da09636cbfa62a9871f74 busybox-1.4.2.ebuild 8231
+EBUILD busybox-1.5.0.ebuild 8185 RMD160 39e38a49d7c6b42cbbde417b3319466b33101989 SHA1 4dc88506d55d45dbfbcefe9efead4bc4d6847918 SHA256 babc836860e12fd6b978f528aaca3f30a30da7d8ec7899b479fccc114de38a2e
+MD5 2a607e2b5bde6ab9552d9d24867c5725 busybox-1.5.0.ebuild 8185
+RMD160 39e38a49d7c6b42cbbde417b3319466b33101989 busybox-1.5.0.ebuild 8185
+SHA256 babc836860e12fd6b978f528aaca3f30a30da7d8ec7899b479fccc114de38a2e busybox-1.5.0.ebuild 8185
 MISC ChangeLog 21397 RMD160 0560b0307c0e3ac75438bb82e393a995b411fbf3 SHA1 e61c1590f81658241ad77a4475df726cba93d360 SHA256 e838b9740468f777e7507b15c1e1821e8b4006483340f546e949a045a130443d
 MD5 c4d64e385f6a7a61688b83053d7c0bad ChangeLog 21397
 RMD160 0560b0307c0e3ac75438bb82e393a995b411fbf3 ChangeLog 21397
@@ -100,7 +100,7 @@ SHA256 07a1d99470a24ffb961a0d1bdd253fc04e90a28f3e76e10b18c0c844ce54f8cd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGBqOg8bi6rjpTunYRAtIgAKChMAWt/jXyqAe3J9myFeRMgduBxwCgsGEG
-XFIyi/J75pwa+rM+DRLhrXA=
-=Rl6P
+iD8DBQFGCgSC8bi6rjpTunYRAt2uAJ0ayfAKnPuDIJEI8ddFgGd8zCHwCQCgkfgp
+5E90+S35U+3DvAcPMzT0JuI=
+=qF9l
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.4.1-r2.ebuild b/sys-apps/busybox/busybox-1.4.1-r2.ebuild
index 4760438af9d4..612baf7be2a2 100644
--- a/sys-apps/busybox/busybox-1.4.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.1-r2.ebuild,v 1.8 2007/03/25 16:29:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.1-r2.ebuild,v 1.9 2007/03/28 06:00:19 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -183,7 +183,7 @@ src_compile() {
 	emake busybox || die "build failed"
 	if ! use static ; then
 		mv busybox_unstripped{,.bak}
-		LDFLAGS="${LDFLAGS} -static" emake busybox || die "static build failed"
+		emake CONFIG_STATIC=y busybox || die "static build failed"
 		mv busybox_unstripped bb
 		mv busybox_unstripped{.bak,}
 	fi
diff --git a/sys-apps/busybox/busybox-1.4.2.ebuild b/sys-apps/busybox/busybox-1.4.2.ebuild
index 6d59ad6c9d2f..58cdef3bd707 100644
--- a/sys-apps/busybox/busybox-1.4.2.ebuild
+++ b/sys-apps/busybox/busybox-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.2.ebuild,v 1.2 2007/03/25 16:29:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.2.ebuild,v 1.3 2007/03/28 06:00:19 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -181,7 +181,7 @@ src_compile() {
 	emake busybox || die "build failed"
 	if ! use static ; then
 		mv busybox_unstripped{,.bak}
-		LDFLAGS="${LDFLAGS} -static" emake busybox || die "static build failed"
+		emake CONFIG_STATIC=y busybox || die "static build failed"
 		mv busybox_unstripped bb
 		mv busybox_unstripped{.bak,}
 	fi
diff --git a/sys-apps/busybox/busybox-1.5.0.ebuild b/sys-apps/busybox/busybox-1.5.0.ebuild
index 473a6fba6389..0d65689e7b67 100644
--- a/sys-apps/busybox/busybox-1.5.0.ebuild
+++ b/sys-apps/busybox/busybox-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.5.0.ebuild,v 1.1 2007/03/25 15:00:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.5.0.ebuild,v 1.2 2007/03/28 06:00:19 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -180,7 +180,7 @@ src_compile() {
 	emake busybox || die "build failed"
 	if ! use static ; then
 		mv busybox_unstripped{,.bak}
-		LDFLAGS="${LDFLAGS} -static" emake busybox || die "static build failed"
+		emake CONFIG_STATIC=y busybox || die "static build failed"
 		mv busybox_unstripped bb
 		mv busybox_unstripped{.bak,}
 	fi