toolchain/*: use CONFIG_UPDATE

Based on e0e0945e in Bernhard's tree.

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 95d8deee30b22d1a750b313191babbd5932c4a6f..f221b47bb53074cdcefd9ed03b7ca56049870562 100644 (file)
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -27,7 +27,7 @@ libgmp-source: $(DL_DIR)/$(GMP_SOURCE)
 $(GMP_DIR)/.unpacked: $(DL_DIR)/$(GMP_SOURCE)
        $(GMP_CAT) $(DL_DIR)/$(GMP_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
        toolchain/patch-kernel.sh $(GMP_DIR) package/gmp/ \*.patch
-       $(CONFIG_UPDATE) $(GMP_DIR)
+       $(CONFIG_UPDATE) $(@D)
        touch $@
 
 $(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked

diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 7c1febf4b8fda09ff6a0fe319e7046c468ceebc2..85fbbd73aadce85433ffe30a9a6835bc5aa97ee2 100644 (file)
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -30,7 +30,7 @@ $(DL_DIR)/$(MPFR_SOURCE):
 $(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE)
        $(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
        toolchain/patch-kernel.sh $(MPFR_DIR) package/mpfr/ \*.patch
-       $(CONFIG_UPDATE) $(MPFR_DIR)
+       $(CONFIG_UPDATE) $(@D)
 ifneq ($(MPFR_PATCH),)
        ( cd $(MPFR_DIR); patch -p1 -N -Z < $(MPFR_PATCH_SOURCE); )
 endif

diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index 46e73344863a3130bdeaea90b80693a7b67afd25..d1543058b8802dce445a741dd611cfaa54669b53 100644 (file)
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -88,7 +88,7 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)
        mkdir -p $(TOOL_BUILD_DIR)
        rm -rf $(BINUTILS_DIR)
        $(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-       $(CONFIG_UPDATE) $(BINUTILS_DIR)
+       $(CONFIG_UPDATE) $(@D)
        touch $@
 
 binutils-patched: $(BINUTILS_DIR)/.patched

diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index 8b19e68e9feda3e0b0696afcdb93342fe81266ed..f30823c4d868295fcf3a7c71ee2b13d5890320fd 100644 (file)
--- a/toolchain/ccache/ccache.mk
+++ b/toolchain/ccache/ccache.mk
@@ -29,6 +29,7 @@ $(CCACHE_DIR1)/.patched: $(CCACHE_DIR1)/.unpacked
        $(SED) "s,getenv(\"CCACHE_DIR\"),\"$(BR2_CCACHE_DIR)\",g" \
                $(CCACHE_DIR1)/ccache.c
        mkdir -p $(CCACHE_DIR1)/cache
+       $(CONFIG_UPDATE) $(@D)
        touch $@
 
 $(CCACHE_DIR1)/.configured: $(CCACHE_DIR1)/.patched

diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index dd89c06099a390e2827e843912e9231fd777b919..640a04a6722c1fe116f8e10462762f2f49af980d 100644 (file)
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -19,6 +19,7 @@ ifeq ($(strip $(ARCH)),nios2)
        $(SED) "s,CROSS_COMPILE_PREFIX,$(REAL_GNU_TARGET_NAME),g;" toolchain/elf2flt/elf2flt.nios2.conditional
        toolchain/patch-kernel.sh $(ELF2FLT_DIR) toolchain/elf2flt elf2flt.nios2.conditional
 endif
+       $(CONFIG_UPDATE) $(@D)
        touch $@
 
 $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index c585f533850f8de5ef3cef6555dc914b4f1f44e8..3f1a3cac44d5711859fe0a52937201f36c702b7f 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -144,7 +144,7 @@ gcc-unpacked: $(GCC_DIR)/.patched
 $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
        mkdir -p $(TOOL_BUILD_DIR)
        $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-       $(CONFIG_UPDATE) $(GCC_DIR)
+       $(CONFIG_UPDATE) $(@D)
        touch $@
 
 gcc-patched: $(GCC_DIR)/.patched

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 38ed145c25acfeceaf0b17a8b18838938ff9d011..d57fd40609c57feb214bbe0847b0acfa4e3178f1 100644 (file)
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -58,7 +58,7 @@ ifeq ($(GDB_VERSION),snapshot)
        ln -sf $(TOOL_BUILD_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
 endif
        toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch
-       $(CONFIG_UPDATE) $(GDB_DIR)
+       $(CONFIG_UPDATE) $(@D)
        touch $@
 
 gdb-patched: $(GDB_DIR)/.unpacked