[OpenWrt-Devel] [PATCH][RESEND] [tools] toolchain: ensure tools are built and staged before preparing toolchain

[John Szakmeister]

On Sat, Dec 13, 2014 at 4:28 AM, John Szakmeister <john at szakmeister.net> wrote:
[snip]
>> This doesn't look right to me, I don't think we should add the
>> toolchain/prepare step as an intermediate target for the regular build
>> process.
>> How about just adding this line to Makefile and leaving out the rest:
>>
>> toolchain/prepare: $(tools/stamp-install)
>
> Who will depend on the toolchain/prepare to make sure that it
> happens before toolchain/install?  I couldn't find this
> happening automatically in the Makefiles, that's why I went
> through the work of setting up the intermediate target.
>
> Trying your version locally fails.

Turns out this second version doesn't work either.  One of my
branches had the first version of the fix in it.  FWIW, the
first thing I tried was the following, but it didn't seem like
the right approach--though it does work correctly:


commit 161c49cdbc0b81d3e6072dc788cb5432760e7777
Author: John Szakmeister <john at szakmeister.net>
Date:   Wed Sep 17 06:47:58 2014 -0400

    toolchain: ensure tools are built and staged before preparing toolchain

    This fixes an issue where the toolchain/prepare step could run, but some
    of the necessary host tools might be missing.

    Signed-off-by: John Szakmeister <john at szakmeister.net>

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 36c6ed3..f534cbc 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -74,7 +74,7 @@ endif

# prerequisites for the individual targets
$(curdir)/ := .config prereq
-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk
+$(curdir)//prepare = $(STAGING_DIR)/.prepared
$(TOOLCHAIN_DIR)/info.mk tools/install
$(curdir)//compile = $(1)/prepare
$(curdir)//install = $(1)/compile
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel