X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=tools%2FMakefile;h=346f0e9f389410af07bd71b6ffb3004b0e609905;hp=c50881965e1abdca12b7ce3a9cdd6d1db61a028a;hb=3d41dbae65fb3d5103dd0a7d6178c4990596b3db;hpb=6dec519be7a9814d6c93aa8cfb9bcb025708b1b1 diff --git a/tools/Makefile b/tools/Makefile index c50881965e..346f0e9f38 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -11,33 +11,37 @@ 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 - ifeq ($(CONFIG_GCC_USE_SYSTEM_PPL_CLOOG),) - BUILD_PPL_CLOOG = y + ifdef CONFIG_GCC_USE_GRAPHITE + ifneq ($(CONFIG_GCC_VERSION_4_8),) + ifeq ($(CONFIG_GCC_USE_SYSTEM_PPL_CLOOG),) + BUILD_PPL_CLOOG = y + endif + else + BUILD_ISL = y + endif 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 +tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat 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 make-ext4fs 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 gengetopt +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_mxs) += elftosb sdimage +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-$(BUILD_ISL) += isl tools-$(CONFIG_USE_SPARSE) += sparse # builddir dependencies @@ -48,7 +52,6 @@ $(curdir)/libtool/compile := $(curdir)/sed/install $(curdir)/m4/install $(curdir $(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)/automake/compile := $(curdir)/m4/install $(curdir)/autoconf/install $(curdir)/pkg-config/install $(curdir)/xz/install $(curdir)/gmp/compile := $(curdir)/libtool/install @@ -62,8 +65,6 @@ $(curdir)/mklibs/compile := $(curdir)/libtool/install $(curdir)/qemu/compile := $(curdir)/e2fsprogs/install $(curdir)/upslug2/compile := $(curdir)/libtool/install $(curdir)/mm-macros/compile := $(curdir)/libtool/install -$(curdir)/xorg-macros/compile := $(curdir)/libtool/install -$(curdir)/xfce-macros/compile := $(curdir)/libtool/install $(curdir)/missing-macros/compile := $(curdir)/autoconf/install $(curdir)/e2fsprogs/compile := $(curdir)/libtool/install $(curdir)/libelf/compile := $(curdir)/libtool/install @@ -71,12 +72,14 @@ $(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)/isl/compile := $(curdir)/gmp/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),) -$(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) +ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) +$(foreach tool, $(filter-out patch,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) tools-y += ccache endif @@ -84,6 +87,9 @@ endif # 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) @@ -111,47 +117,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