Commit cb5710c5 authored by Michael Roth's avatar Michael Roth Committed by Peter Korsgaard
Browse files

rename TOOL_BUILD_DIR to TOOLCHAIN_DIR 



To reflect the new output directory hierachy rename the Makefile variable
TOOL_BUILD_DIR to TOOLCHAIN_DIR.

Signed-off-by: default avatarMichael Roth <mroth@nessie.de>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent be695dcc

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ $(BR2_DEPENDS_DIR): .config 
	mkdir -p $(@D)

	cp -dpRf $(CONFIG)/buildroot-config $@



dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \

dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \

	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)



$(BASE_TARGETS): dirs
@@ -337,7 +337,7 @@ world: dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL) 
.PHONY: all world dirs clean dirclean distclean source \

	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \

	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \

	$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \

	$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \

	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)



#############################################################
@@ -346,7 +346,7 @@ world: dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL) 
# dependencies anywhere else

#

#############################################################

$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR):

$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR):

	@mkdir -p $@



$(STAGING_DIR):
@@ -446,7 +446,7 @@ distclean: 
ifeq ($(DL_DIR),$(BASE_DIR)/dl)

	rm -rf $(DL_DIR)

endif

	rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(BUILD_DIR) $(BINARIES_DIR) \

	rm -rf $(TOOLCHAIN_DIR) $(BUILD_DIR) $(BINARIES_DIR) \

	.config.cmd

	$(MAKE) -C $(CONFIG) clean

package/Makefile.in

+4 −4
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ COND_ARCH_FPU_SUFFIX:= 
endif



ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

TOOL_BUILD_DIR=$(BASE_DIR)/toolchain

TOOLCHAIN_DIR=$(BASE_DIR)/toolchain



# Quotes are needed for spaces et al in path components.

TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"

TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"

IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)

GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux

REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
@@ -124,8 +124,8 @@ KERNEL_CROSS=$(TARGET_CROSS) 
else

TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))

TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))

TOOL_BUILD_DIR=$(BASE_DIR)/toolchain

TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"

TOOLCHAIN_DIR=$(BASE_DIR)/toolchain

TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"

#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)

IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)

package/file/file.mk

+5 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ FILE_VERSION:=4.26 
FILE_SOURCE:=file-$(FILE_VERSION).tar.gz

FILE_SITE:=ftp://ftp.astron.com/pub/file/

FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VERSION)

FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VERSION)-host

FILE_DIR1:=$(TOOLCHAIN_DIR)/file-$(FILE_VERSION)-host

FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VERSION)-target

FILE_CAT:=$(ZCAT)

FILE_BINARY:=src/file
@@ -33,11 +33,11 @@ $(FILE_DIR1)/.configured: $(FILE_SOURCE_DIR)/.unpacked 
	)

	touch $@



$(TOOL_BUILD_DIR)/bin/file: $(FILE_DIR1)/.configured

$(TOOLCHAIN_DIR)/bin/file: $(FILE_DIR1)/.configured

	$(MAKE) -C $(FILE_DIR1) install

	ln -sf $(FILE_DIR1)/install/bin/file $(TOOL_BUILD_DIR)/bin/file

	ln -sf $(FILE_DIR1)/install/bin/file $(TOOLCHAIN_DIR)/bin/file



host-file: $(TOOL_BUILD_DIR)/bin/file

host-file: $(TOOLCHAIN_DIR)/bin/file



host-file-clean:

	-$(MAKE) -C $(FILE_DIR1) clean
@@ -84,7 +84,7 @@ $(FILE_DIR2)/.configured: $(FILE_SOURCE_DIR)/.unpacked 
	)

	touch $@



$(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOL_BUILD_DIR)/bin/file

$(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOLCHAIN_DIR)/bin/file

	ln -sf $(FILE_DIR1)/install/bin/file $(FILE_DIR2)/magic/file

	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="-static" -C $(FILE_DIR2)

package/gmp/gmp.mk

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ GMP_VERSION:=4.2.4 
GMP_SOURCE:=gmp-$(GMP_VERSION).tar.bz2

GMP_SITE:=$(BR2_GNU_MIRROR)/gmp

GMP_CAT:=$(BZCAT)

GMP_DIR:=$(TOOL_BUILD_DIR)/gmp-$(GMP_VERSION)

GMP_DIR:=$(TOOLCHAIN_DIR)/gmp-$(GMP_VERSION)

GMP_TARGET_DIR:=$(BUILD_DIR)/gmp-$(GMP_VERSION)

GMP_BINARY:=libgmp$(LIBTGTEXT)

GMP_HOST_BINARY:=libgmp$(HOST_LIBEXT)
@@ -25,7 +25,7 @@ $(DL_DIR)/$(GMP_SOURCE): 
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) -

	$(GMP_CAT) $(DL_DIR)/$(GMP_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(GMP_DIR) package/gmp/ \*.patch

	$(CONFIG_UPDATE) $(@D)

	touch $@
@@ -72,8 +72,8 @@ libgmp-clean: 
libgmp-dirclean:

	rm -rf $(GMP_TARGET_DIR) $(GMP_DIR)



GMP_DIR2:=$(TOOL_BUILD_DIR)/gmp-$(GMP_VERSION)-host

GMP_HOST_DIR:=$(TOOL_BUILD_DIR)/gmp

GMP_DIR2:=$(TOOLCHAIN_DIR)/gmp-$(GMP_VERSION)-host

GMP_HOST_DIR:=$(TOOLCHAIN_DIR)/gmp

$(GMP_DIR2)/.configured: $(GMP_DIR)/.unpacked

	mkdir -p $(GMP_DIR2)

	(cd $(GMP_DIR2); rm -rf config.cache; \

package/lzma/lzma.mk

+9 −9
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ LZMA_VERSION:=4.32.6 
LZMA_SOURCE:=lzma-$(LZMA_VERSION).tar.gz

LZMA_CAT:=$(ZCAT)

LZMA_SITE:=http://tukaani.org/lzma/

LZMA_HOST_DIR:=$(TOOL_BUILD_DIR)/lzma-$(LZMA_VERSION)

LZMA_HOST_DIR:=$(TOOLCHAIN_DIR)/lzma-$(LZMA_VERSION)

LZMA_TARGET_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VERSION)

LZMA_TARGET_BINARY:=bin/lzma



# lzma binary for use on the host

LZMA=$(TOOL_BUILD_DIR)/bin/lzma

LZMA=$(TOOLCHAIN_DIR)/bin/lzma

HOST_LZMA_BINARY=$(shell package/lzma/lzmacheck.sh)

HOST_LZMA_IF_ANY=$(shell toolchain/dependencies/check-host-lzma.sh)
@@ -27,7 +27,7 @@ $(DL_DIR)/$(LZMA_SOURCE): 
######################################################################



$(LZMA_HOST_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)

	$(LZMA_CAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -

	$(LZMA_CAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(LZMA_HOST_DIR) package/lzma/ lzma\*.patch

	touch $@
@@ -51,15 +51,15 @@ $(STAGING_DIR)/bin/lzma: $(LZMA_HOST_DIR)/src/lzma/lzma 


.PHONY: lzma-host use-lzma-host-binary

use-lzma-host-binary:

	if [ ! -f "$(TOOL_BUILD_DIR)/bin/lzma" ]; then \

		[ -d $(TOOL_BUILD_DIR)/bin ] || mkdir -p $(TOOL_BUILD_DIR)/bin; \

		ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOL_BUILD_DIR)/bin/lzma"; \

	if [ ! -f "$(TOOLCHAIN_DIR)/bin/lzma" ]; then \

		[ -d $(TOOLCHAIN_DIR)/bin ] || mkdir -p $(TOOLCHAIN_DIR)/bin; \

		ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOLCHAIN_DIR)/bin/lzma"; \

	fi



build-lzma-host-binary: $(LZMA_HOST_DIR)/src/lzma/lzma

	-rm -f $(TOOL_BUILD_DIR)/bin/lzma

	[ -d $(TOOL_BUILD_DIR)/bin ] || mkdir $(TOOL_BUILD_DIR)/bin

	cp -pf $(LZMA_HOST_DIR)/src/lzma/lzma $(TOOL_BUILD_DIR)/bin/lzma

	-rm -f $(TOOLCHAIN_DIR)/bin/lzma

	[ -d $(TOOLCHAIN_DIR)/bin ] || mkdir $(TOOLCHAIN_DIR)/bin

	cp -pf $(LZMA_HOST_DIR)/src/lzma/lzma $(TOOLCHAIN_DIR)/bin/lzma



host-lzma: $(HOST_LZMA_BINARY)