Add fix from upstream for make-3.82 building #332911 by Lars Wendler.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 42 insertions, 5 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index e75bcade8f00..9d04a94177cb 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.254 2010/08/16 21:23:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.255 2010/08/22 17:34:06 vapier Exp $
+
+  22 Aug 2010; Mike Frysinger <vapier@gentoo.org>
+  +files/busybox-1.17.1-make.patch:
+  Add fix from upstream for make-3.82 building #332911 by Lars Wendler.
 
 *busybox-1.17.1-r1 (16 Aug 2010)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 047930ca6ab7..2a1d5addde42 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX busybox-1.15.2-bb.patch 956 RMD160 13d7f8e8fdb35245de4072ff1e55470b2c58f6db SHA1 ab66f70245a399a1a21af0e5598fd2fae809d935 SHA256 482de22b18764e8e0b264bb00d03accf9b821666b64f1a423068b10b30b4893c
 AUX busybox-1.16.0-bb.patch 1124 RMD160 c59e37bd32f9a05d78fca4599dcfdbc88d373c95 SHA1 8028db3af9fcbfa57d3af022e80074836766b7d9 SHA256 c938fd454dcafcf6a9d725104d78dd52fd1f5b9a98507ff8023e9b7419b103ce
 AUX busybox-1.17.0-bb.patch 1039 RMD160 abd095949a1a5797a770dd84fbdd247490a7420f SHA1 4f3399421c00961f066b65f4f1955363dc9ed746 SHA256 be449a26d5e87431e2192f79f945e3bf0c999873306d40bf9c0d6cc61da08d48
+AUX busybox-1.17.1-make.patch 1220 RMD160 1497949df75c16836d3fcba306e216eae77c3eb2 SHA1 480ae07dbad0197120b3c0b104ebb05185fad44b SHA256 20639423503b1ecfc4208d20e38141776964e9a168c1b3875d389cb3009de8fd
 AUX busybox-1.17.1-mdev.patch 1833 RMD160 ff2653d7697a920c84061bbe96cbc4adc5df4665 SHA1 633d1cae37a03ca9ee9a164e0b9db622798aeec9 SHA256 54a96234ccefb06fef1673c70e3f43ad0ed4fc53bd8db32601beeaf71a206797
 AUX busybox-1.17.1-mktemp.patch 553 RMD160 98a344fbfb84fd1c4c14ffe72a4e4020f0e1042b SHA1 51a7d6215bef650130eec9014793bb75a769c3b5 SHA256 35cb5d2156826a2a5e4866f5ef52ed85c38c3e64e50a1c05a6466cb3c7a4def0
 AUX busybox-1.17.1-sed.patch 4385 RMD160 a95bf628faa8e5bbe9c35095d22ad5e0258946ca SHA1 a6c181f40b9fc150b19eb691cb6bde7060c102c5 SHA256 7bc59298b351ec5485be2a144d2325a6cb43517f1f8c169b01d8b639f6ec42b4
@@ -20,12 +21,12 @@ DIST busybox-1.17.1.tar.bz2 2091108 RMD160 4c5ad66bd761cdf0feefe0d8f6d68878dc72b
 EBUILD busybox-1.15.3.ebuild 7403 RMD160 574c4cc57a16c18a7409a67c25cf80e843b9e6f5 SHA1 d7c983ec464201e6934ccc6ca247aea37e109ac9 SHA256 1bf516cfbee42acf2b792729a066b7bf976aac90965b77fe9f460cdcff3d8999
 EBUILD busybox-1.16.0.ebuild 7704 RMD160 e6fcfe2aef050f5ed54bd109b81bd2666c589639 SHA1 2ee2f6315b686c4185766c34d2916dfdf4de6376 SHA256 0a7c9fd470a09b5b77bb6bc52b020394691c8b6e40dbde2f68724741161e1555
 EBUILD busybox-1.17.1-r1.ebuild 7684 RMD160 1414980af3833e4e6e092e75a46185f61127a04b SHA1 9bc4da3d9fe48578aed03e606ac5ac436ffc52ef SHA256 96dbe54ed79e2e33bc84c1f86eae5af8a96acf639154126719b77d766574fd90
-MISC ChangeLog 37568 RMD160 27a5597812dc41001204ca4fd29dcfc6945a7832 SHA1 42abf798cb3c5d5917a716678f5bac03bf40da24 SHA256 50800be2d9cbc0c2c61dabcb49250d947e67836607b0b9afda6e4a4e349b8e52
+MISC ChangeLog 37727 RMD160 a06ae2e0489c39d6a67f310d1bb03b84e4ced6d5 SHA1 8afd794cd38a715e7b88b8947d6623ea9bb65da3 SHA256 0a51d168730d7abd77ded6e0a1a0f876e12b17667d346af19911d6befdeef687
 MISC metadata.xml 368 RMD160 2facee7f44b7469c85383961c2dd4338ea6fffcb SHA1 eae78f6b5eb3a21aeae692f9a7420ab536be3739 SHA256 033b1cb2abe759f73b184ce43b5c791454716638090767c2bc70cc52b4ef187f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxprP0ACgkQTwhj9JtAlp6YHQEAlS8unJT9me1yyp0CXfVaE1RW
-fWlYnKvIu1l7cp1j24EBAL2daB22wmvhEf7/5tS3GOIkgKftYC4BCEQMWBXxCjBG
-=dFh/
+iF4EAREIAAYFAkxxYEIACgkQTwhj9JtAlp5HgwEAnzCHQJpWA/SyU66daNPCPayi
+xVSLZH9croWs0lzph1UBAJu5zruho5n73MTNPGJwcSrqVCU8LSwGBdDjOJpf5jQq
+=xMEY
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/files/busybox-1.17.1-make.patch b/sys-apps/busybox/files/busybox-1.17.1-make.patch
new file mode 100644
index 000000000000..6177696d9aa3
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.17.1-make.patch
@@ -0,0 +1,32 @@
+diff -urpN busybox-1.17.1/Makefile busybox-1.17.1-make/Makefile
+--- busybox-1.17.1/Makefile	2010-07-25 00:13:44.000000000 +0200
++++ busybox-1.17.1-make/Makefile	2010-08-22 09:30:33.000000000 +0200
+@@ -433,7 +433,12 @@ ifeq ($(config-targets),1)
+ -include $(srctree)/arch/$(ARCH)/Makefile
+ export KBUILD_DEFCONFIG
+ 
+-config %config: scripts_basic outputmakefile gen_build_files FORCE
++config: scripts_basic outputmakefile gen_build_files FORCE
++	$(Q)mkdir -p include
++	$(Q)$(MAKE) $(build)=scripts/kconfig $@
++	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
++
++%config: scripts_basic outputmakefile gen_build_files FORCE
+ 	$(Q)mkdir -p include
+ 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
+ 	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+@@ -1285,9 +1290,13 @@ endif
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ 
+ # Modules
+-/ %/: prepare scripts FORCE
++%/: prepare scripts FORCE
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+ 	$(build)=$(build-dir)
++/: prepare scripts FORCE
++	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
++	$(build)=$(build-dir)
++
+ %.ko: prepare scripts FORCE
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
+ 	$(build)=$(build-dir) $(@:.ko=.o)