X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/df15ee9bcb035d7cc296d2582dad314569e38ec0..d460a0671d57d54c2a6022d9fe5d97783934c50d:/tools/Makefile diff --git a/tools/Makefile b/tools/Makefile index ebcf98c56..413704d75 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,14 +10,13 @@ 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 +ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN)$(CONFIG_GCC_LLVM),) +tools-y += gmp mpfr 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-y += firmware-utils patch-cmdline quilt yaffs2 flock padjffs2 +tools-y += mm-macros xorg-macros xfce-macros missing-macros xz cmake tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 tools-$(CONFIG_TARGET_x86) += qemu ifneq ($(CONFIG_TARGET_ar71xx),) @@ -38,20 +37,26 @@ $(curdir)/bison/compile := $(curdir)/flex/install $(curdir)/pkg-config/compile := $(curdir)/sed/install $(curdir)/libtool/compile := $(curdir)/sed/install $(curdir)/squashfs/compile := $(curdir)/lzma-old/install -$(curdir)/squashfs4/compile := $(curdir)/lzma/install +$(curdir)/squashfs4/compile := $(curdir)/xz/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)/ppl/compile := $(curdir)/gmp/install $(curdir)/automake/install -$(curdir)/cloog/compile := $(curdir)/ppl/install $(curdir)/automake/install +$(curdir)/gmp/compile := $(curdir)/automake/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)/mkimage/compile := $(curdir)/sed/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)/builddirs := $(tools-y) $(tools-dep) $(tools-) $(curdir)/builddirs-default := $(tools-y) @@ -59,7 +64,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; \ @@ -74,8 +79,9 @@ $(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/ touch $@ @@ -102,5 +108,5 @@ $(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($( $(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)) +$(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_5 CONFIG_GCC_USE_GRAPHITE CONFIG_TARGET_orion_generic)) $(eval $(call subdir,$(curdir)))