diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-08-22 17:34:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-22 17:34:06 +0000 |
| commit | 7f95af489f2d100bbfa7bfc3cc006d9bdb4d35dc (patch) | |
| tree | c71029268eb390906985a9020e6b342d95b0f82e /sys-apps/busybox | |
| parent | Version bump, fixes bug #333487. (diff) | |
| download | gentoo-2-7f95af489f2d100bbfa7bfc3cc006d9bdb4d35dc.tar.gz gentoo-2-7f95af489f2d100bbfa7bfc3cc006d9bdb4d35dc.tar.bz2 gentoo-2-7f95af489f2d100bbfa7bfc3cc006d9bdb4d35dc.zip | |
Add fix from upstream for make-3.82 building #332911 by Lars Wendler.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/busybox/files/busybox-1.17.1-make.patch | 32 |
2 files changed, 37 insertions, 1 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/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) |