lkml.org 
[lkml]   [2010]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[002/111] powerpc: fix build with make 3.82
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Sam Ravnborg <sam@ravnborg.org>

    commit e32e78c5ee8aadef020fbaecbe6fb741ed9029fd upstream.

    Thomas Backlund reported that the powerpc build broke with make 3.82.
    It failed with the following message:

    arch/powerpc/Makefile:183: *** mixed implicit and normal rules. Stop.

    The fix is to avoid mixing non-wildcard and wildcard targets.

    Reported-by: Thomas Backlund <tmb@mandriva.org>
    Tested-by: Thomas Backlund <tmb@mandriva.org>
    Cc: Michal Marek <mmarek@suse.cz>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/powerpc/Makefile | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    --- a/arch/powerpc/Makefile
    +++ b/arch/powerpc/Makefile
    @@ -158,9 +158,11 @@ drivers-$(CONFIG_OPROFILE) += arch/power
    # Default to zImage, override when needed
    all: zImage

    -BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
    +# With make 3.82 we cannot mix normal and wildcard targets
    +BOOT_TARGETS1 := zImage zImage.initrd uImaged
    +BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.%

    -PHONY += $(BOOT_TARGETS)
    +PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)

    boot := arch/$(ARCH)/boot

    @@ -175,10 +177,16 @@ relocs_check: arch/powerpc/relocs_check.
    zImage: relocs_check
    endif

    -$(BOOT_TARGETS): vmlinux
    +$(BOOT_TARGETS1): vmlinux
    + $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
    +$(BOOT_TARGETS2): vmlinux
    + $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
    +
    +
    +bootwrapper_install:
    $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

    -bootwrapper_install %.dtb:
    +%.dtb:
    $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

    define archhelp



    \
     
     \ /
      Last update: 2010-08-12 02:49    [W:0.024 / U:65.356 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site