X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=tools%2FMakefile;h=7d4ab01ce59ed36942f982647767843cf320ca9d;hp=562925160fa50946932f5b068d03944db831ee82;hb=cbf27e02fae8f30aab54a9186e441b1aa53c57da;hpb=eadc2354ae0a1dfd14be6443e7cc820cf91677eb diff --git a/tools/Makefile b/tools/Makefile index 562925160f..7d4ab01ce5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -11,7 +11,7 @@ curdir:=tools # subdirectories to descend into tools-y := -ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN)$(CONFIG_GCC_LLVM),) +ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) BUILD_TOOLCHAIN := y endif ifdef CONFIG_GCC_USE_GRAPHITE @@ -25,15 +25,14 @@ endif tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs -tools-y += sstrip ipkg-utils genext2fs e2fsprogs mtd-utils mkimage +tools-y += sstrip genext2fs e2fsprogs mtd-utils mkimage tools-y += firmware-utils patch-image patch quilt yaffs2 flock padjffs2 -tools-y += mm-macros xorg-macros xfce-macros missing-macros xz cmake scons bc -tools-y += findutils +tools-y += mm-macros missing-macros xz cmake scons bc findutils gengetopt patchelf tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 tools-$(CONFIG_powerpc) += upx tools-$(CONFIG_TARGET_x86) += qemu tools-$(CONFIG_TARGET_mxs) += elftosb -tools-$(CONFIG_TARGET_brcm2708)$(CONFIG_TARGET_sunxi) += mtools dosfstools +tools-$(CONFIG_TARGET_brcm2708)$(CONFIG_TARGET_sunxi)$(CONFIG_TARGET_mxs) += mtools dosfstools tools-$(CONFIG_TARGET_ar71xx) += lzma-old squashfs tools-y += lzma squashfs4 tools-$(BUILD_B43_TOOLS) += b43-tools @@ -42,38 +41,38 @@ tools-$(CONFIG_USE_SPARSE) += sparse # builddir dependencies $(curdir)/bison/compile := $(curdir)/flex/install -$(curdir)/flex/compile := $(curdir)/automake/install +$(curdir)/flex/compile := $(curdir)/libtool/install $(curdir)/pkg-config/compile := $(curdir)/sed/install -$(curdir)/libtool/compile := $(curdir)/sed/install $(curdir)/m4/install +$(curdir)/libtool/compile := $(curdir)/sed/install $(curdir)/m4/install $(curdir)/autoconf/install $(curdir)/automake/install $(curdir)/missing-macros/install $(curdir)/squashfs/compile := $(curdir)/lzma-old/install $(curdir)/squashfs4/compile := $(curdir)/xz/install $(curdir)/quilt/compile := $(curdir)/sed/install $(curdir)/autoconf/install $(curdir)/findutils/install -$(curdir)/dtc/compile := $(curdir)/bison/install -$(curdir)/autoconf/compile := $(curdir)/m4/install $(curdir)/libtool/install +$(curdir)/autoconf/compile := $(curdir)/m4/install $(curdir)/automake/compile := $(curdir)/m4/install $(curdir)/autoconf/install $(curdir)/pkg-config/install $(curdir)/xz/install -$(curdir)/gmp/compile := $(curdir)/automake/install +$(curdir)/gmp/compile := $(curdir)/libtool/install $(curdir)/mpc/compile := $(curdir)/mpfr/install $(curdir)/gmp/install $(curdir)/mpfr/compile := $(curdir)/gmp/install $(curdir)/ppl/compile := $(curdir)/gmp/install $(curdir)/cloog/compile := $(curdir)/ppl/install $(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/install $(curdir)/xz/install $(curdir)/mkimage/compile := $(curdir)/sed/install -$(curdir)/mklibs/compile := $(curdir)/automake/install +$(curdir)/mklibs/compile := $(curdir)/libtool/install $(curdir)/qemu/compile := $(curdir)/e2fsprogs/install -$(curdir)/upslug2/compile := $(curdir)/automake/install -$(curdir)/mm-macros/compile := $(curdir)/automake/install -$(curdir)/xorg-macros/compile := $(curdir)/automake/install -$(curdir)/xfce-macros/compile := $(curdir)/automake/install -$(curdir)/missing-macros/compile := $(curdir)/automake/install -$(curdir)/e2fsprogs/compile := $(curdir)/automake/install -$(curdir)/libelf/compile := $(curdir)/automake/install +$(curdir)/upslug2/compile := $(curdir)/libtool/install +$(curdir)/mm-macros/compile := $(curdir)/libtool/install +$(curdir)/missing-macros/compile := $(curdir)/autoconf/install +$(curdir)/e2fsprogs/compile := $(curdir)/libtool/install +$(curdir)/libelf/compile := $(curdir)/libtool/install $(curdir)/sdcc/compile := $(curdir)/bison/install $(curdir)/b43-tools/compile := $(curdir)/bison/install $(curdir)/padjffs2/compile := $(curdir)/findutils/install $(curdir)/cloog/compile := $(curdir)/ppl/install $(curdir)/bc/compile := $(curdir)/bison/install +$(curdir)/findutils/compile := $(curdir)/bison/install +$(curdir)/gengetopt/compile := $(curdir)/libtool/install +$(curdir)/patchelf/compile := $(curdir)/libtool/install -ifneq ($(CONFIG_CCACHE),) +ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) tools-y += ccache endif @@ -109,47 +108,10 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build ln -sf lib $(STAGING_DIR_HOST)/lib64 touch $@ - -define PrepareCommand -$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared - @mkdir -p "$$(dir $$@)"; rm -f "$$@" - @export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \ - echo "Command $(1) not found."; false; \ - }; ln -s "$$$$FILE" "$$@" - -endef endif -$(STAGING_DIR_HOST)/bin/stat: $(STAGING_DIR)/.prepared - @rm -f $@ - @if stat --version > /dev/null 2>&1; then \ - ln -s `which stat` $@; \ - elif gstat --version > /dev/null 2>&1; then \ - ln -s `which gstat` $@; \ - elif gnustat --version > /dev/null 2>&1; then \ - ln -s `which gnustat` $@; \ - else \ - echo "GNU stat not found"; \ - false; \ - fi - -$(STAGING_DIR_HOST)/bin/ldconfig: $(STAGING_DIR)/.prepared - touch $@ - chmod +x $@ - -$(eval $(call PrepareCommand,md5sum,gmd5sum md5sum $(SCRIPT_DIR)/md5sum)) -$(eval $(call PrepareCommand,cp,gcp cp)) -$(eval $(call PrepareCommand,seq,gseq seq)) -$(eval $(call PrepareCommand,python,python2 python2.7 python)) -$(eval $(call PrepareCommand,awk,gawk awk)) -$(eval $(call PrepareCommand,getopt,gnugetopt /usr/local/bin/getopt getopt)) -$(eval $(call PrepareCommand,grep,ggrep grep)) -$(eval $(call PrepareCommand,tar,gtar tar)) -$(eval $(call PrepareCommand,diff,gdiff diff)) - -$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,md5sum cp stat seq python awk getopt grep tar diff ldconfig) -$(curdir)//prepare = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps) -$(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps) +$(curdir)//prepare = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared +$(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared # prerequisites for the individual targets $(curdir)/ := .config prereq