X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=tools%2FMakefile;h=dda429f935dee7690f3102f44b6f35391e37ace1;hp=47441b623cf2dfb08920c0a2bd21d705323cb064;hb=cf77766e64dfba8c72906edc3fdedaf71684ebc1;hpb=5884b43b51e60c4329d995d1513ad6d8cdf2a030 diff --git a/tools/Makefile b/tools/Makefile index 47441b623c..dda429f935 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,50 +10,79 @@ curdir:=tools # subdirectories to descend into tools-y := + ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) -tools-$(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5) += gmp mpfr -tools-$(CONFIG_GCC_VERSION_4_5) += mpc libelf -endif -tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs -tools-y += sstrip ipkg-utils genext2fs e2fsprogs mtd-utils mkimage -tools-y += firmware-utils patch-cmdline quilt yaffs2 flock -tools-y += xorg-macros xz -tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 -tools-$(CONFIG_TARGET_x86) += qemu -ifneq ($(CONFIG_TARGET_ar71xx),) -tools-y += lzma-old squashfs + BUILD_TOOLCHAIN := y endif -tools-y += lzma squashfs4 -tools-$(CONFIG_CCACHE) += ccache - ifdef CONFIG_GCC_USE_GRAPHITE ifeq ($(CONFIG_GCC_USE_SYSTEM_PPL_CLOOG),) - tools-y += ppl cloog - $(curdir)/cloog/compile := $(curdir)/ppl/install + BUILD_PPL_CLOOG = y endif endif +ifneq ($(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_kmod-b43legacy)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),) + BUILD_B43_TOOLS = y +endif + +tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat +tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs +tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage +tools-y += firmware-utils patch-image patch quilt yaffs2 flock padjffs2 +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)$(CONFIG_TARGET_mxs) += mtools dosfstools +tools-$(CONFIG_TARGET_ar71xx) += lzma-old squashfs +tools-y += lzma squashfs4 +tools-$(BUILD_B43_TOOLS) += b43-tools +tools-$(BUILD_PPL_CLOOG) += ppl cloog +tools-$(CONFIG_USE_SPARSE) += sparse # builddir dependencies $(curdir)/bison/compile := $(curdir)/flex/install +$(curdir)/flex/compile := $(curdir)/libtool/install $(curdir)/pkg-config/compile := $(curdir)/sed/install -$(curdir)/libtool/compile := $(curdir)/sed/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)/lzma/install -$(curdir)/quilt/compile := $(curdir)/sed/install $(curdir)/autoconf/install -$(curdir)/dtc/compile := $(curdir)/bison/install -$(curdir)/autoconf/compile := $(curdir)/m4/install $(curdir)/libtool/install -$(curdir)/automake/compile := $(curdir)/m4/install $(curdir)/autoconf/install $(curdir)/pkg-config/install -$(curdir)/mpc/compile := $(curdir)/gmp/install -$(curdir)/mpfr/compile := $(curdir)/gmp/install $(curdir)/automake/install +$(curdir)/squashfs4/compile := $(curdir)/xz/install +$(curdir)/quilt/compile := $(curdir)/sed/install $(curdir)/autoconf/install $(curdir)/findutils/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)/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)/mtd-utils/compile := $(curdir)/e2fsprogs/install $(curdir)/xz/install $(curdir)/mkimage/compile := $(curdir)/sed/install +$(curdir)/mklibs/compile := $(curdir)/libtool/install $(curdir)/qemu/compile := $(curdir)/e2fsprogs/install -$(curdir)/upslug2/compile := $(curdir)/automake/install -$(curdir)/xorg-macros/compile := $(curdir)/automake/install -$(curdir)/ppl/compile := $(curdir)/automake/install -$(curdir)/cloog/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)$(CONFIG_SDK),) +$(foreach tool, $(filter-out patch,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) +tools-y += ccache +endif + +# in case there is no patch tool on the host we need to make patch tool a +# dependency for tools which have patches directory +$(foreach tool, $(tools-y), $(if $(wildcard $(curdir)/$(tool)/patches),$(eval $(curdir)/$(tool)/compile += $(curdir)/patch/install))) + +$(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/tar/install)) +tools-y += tar $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-) $(curdir)/builddirs-default := $(tools-y) @@ -61,7 +90,7 @@ $(curdir)/builddirs-default := $(tools-y) ifndef DUMP_TARGET_DB define PrepareStaging @for dir in $(1); do ( \ - set -x; \ + $(if $(QUIET),,set -x;) \ mkdir -p "$$dir"; \ cd "$$dir"; \ mkdir -p bin lib include stamp; \ @@ -76,33 +105,21 @@ $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build $(call PrepareStaging,$(STAGING_DIR_HOST)) - mkdir -p $(BUILD_DIR_HOST)/stamp + mkdir -p $(BUILD_DIR_HOST)/stamp $(STAGING_DIR_HOST)/include/sys $(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/ + $(INSTALL_DATA) $(TOPDIR)/tools/include/sys/*.h $(STAGING_DIR_HOST)/include/sys/ + 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 -$(eval $(call PrepareCommand,find,gfind find)) -$(eval $(call PrepareCommand,md5sum,md5sum $(SCRIPT_DIR)/md5sum)) -$(eval $(call PrepareCommand,cp,gcp cp)) -$(eval $(call PrepareCommand,stat,gstat stat)) - -$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp stat) -$(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 $(curdir)//install = $(1)/compile -$(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_3 CONFIG_GCC_USE_GRAPHITE CONFIG_TARGET_orion_generic)) +tools_enabled = $(foreach tool,$(sort $(tools-y) $(tools-)),$(if $(filter $(tool),$(tools-y)),y,n)) +$(eval $(call stampfile,$(curdir),tools,install,,_$(subst $(space),,$(tools_enabled)))) $(eval $(call subdir,$(curdir)))