123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111 |
- From: Matthias Schiffer <mschiffer@universe-factory.net>
- Date: Sat, 14 Jan 2017 18:13:14 +0100
- Subject: build: move STAGING_DIR_HOSTPKG and BUILD_DIR_HOST back to a common directory for all targets
- $(STAGING_DIR)/host is kept in addition to $(STAGING_DIR_HOSTPKG) in most
- places; it is still used as destination for host files in Build/InstallDev.
- Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
- diff --git a/Makefile b/Makefile
- index b220dfd3c56a11f3e27d70e3d6e58cc6448abd2f..c1a7285c83df310e987eaef8376500d2b614eafb 100644
- --- a/Makefile
- +++ b/Makefile
- @@ -55,7 +55,7 @@ clean: FORCE
- rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages
-
- dirclean: clean
- - rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
- + rm -rf $(STAGING_DIR_HOST) $(STAGING_DIR_HOSTPKG) $(TOOLCHAIN_DIR) $(BUILD_DIR_BASE)/host $(BUILD_DIR_BASE)/hostpkg $(BUILD_DIR_TOOLCHAIN)
- rm -rf $(TMP_DIR)
-
- ifndef DUMP_TARGET_DB
- diff --git a/include/autotools.mk b/include/autotools.mk
- index c6aa47e0bef311697b4def7a7183d1ac59dcf599..7bd400ab36d052b39fcb76a66873c8673eb189a0 100644
- --- a/include/autotools.mk
- +++ b/include/autotools.mk
- @@ -75,7 +75,7 @@ define autoreconf_target
- $(strip $(call autoreconf, \
- $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \
- $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \
- - $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
- + $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR_HOSTPKG)/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
- endef
-
- define patch_libtool_target
- diff --git a/include/cmake.mk b/include/cmake.mk
- index 5a403cbf41e2bbd6bdb843492639a01aff8cf75b..900dae1d4afc6007f8ac04179dd7f0922a07d4fa 100644
- --- a/include/cmake.mk
- +++ b/include/cmake.mk
- @@ -34,7 +34,7 @@ CMAKE_NM:=$(call cmake_tool,$(TARGET_NM))
- CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB))
-
- CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT))
- -CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST)
- +CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST)
- CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
-
- define Build/Configure/Default
- diff --git a/include/host-build.mk b/include/host-build.mk
- index 70bf6e5a399615edb91edfae3c43a93504d7b5d8..6c2f91581b895bda1ee9f2ee94afc2e5c06de380 100644
- --- a/include/host-build.mk
- +++ b/include/host-build.mk
- @@ -122,7 +122,7 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
- endif
-
- define Host/Exports/Default
- - $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
- + $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR_HOSTPKG)/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
- $(1) : export STAGING_PREFIX=$$(HOST_BUILD_PREFIX)
- $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig:$$(HOST_BUILD_PREFIX)/lib/pkgconfig
- $(1) : export PKG_CONFIG_LIBDIR=$$(HOST_BUILD_PREFIX)/lib/pkgconfig
- diff --git a/include/package.mk b/include/package.mk
- index 32485176577b040f6e4a561c5d1144509877bcdf..ea801288eadb139cc0dd2412b4c927c6bd7330e0 100644
- --- a/include/package.mk
- +++ b/include/package.mk
- @@ -130,7 +130,7 @@ ifdef USE_SOURCE_DIR
- endif
-
- define Build/Exports/Default
- - $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p))
- + $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR_HOSTPKG)/share/aclocal $$(STAGING_DIR_HOSTPKG)/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p))
- $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr
- $(1) : export PATH=$$(TARGET_PATH_PKG)
- $(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
- diff --git a/rules.mk b/rules.mk
- index 04fd936660bef4af49de5500cd2d7c3601c1b9f6..95b18f9e5c69de479db54c5bdb740103140dcf74 100644
- --- a/rules.mk
- +++ b/rules.mk
- @@ -145,9 +145,9 @@ STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
- BUILD_LOG_DIR:=$(TOPDIR)/logs
- PKG_INFO_DIR := $(STAGING_DIR)/pkginfo
-
- -BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR)/host,$(BUILD_DIR_BASE)/host)
- +BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR_BASE)/hostpkg,$(BUILD_DIR_BASE)/host)
- STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host
- -STAGING_DIR_HOSTPKG:=$(STAGING_DIR)/host
- +STAGING_DIR_HOSTPKG:=$(TOPDIR)/staging_dir/hostpkg
-
- TARGET_PATH:=$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH)))))
- TARGET_INIT_PATH:=$(call qstrip,$(CONFIG_TARGET_INIT_PATH))
- @@ -206,7 +206,7 @@ ifndef DUMP
- endif
- endif
- endif
- -TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH)
- +TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(STAGING_DIR_HOSTPKG)/bin:$(TARGET_PATH)
-
- ifeq ($(CONFIG_SOFT_FLOAT),y)
- SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
- @@ -232,9 +232,9 @@ export PKG_CONFIG
-
- HOSTCC:=gcc
- HOSTCXX:=g++
- -HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR)/host/include)
- +HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
- HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
- -HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR)/host/lib)
- +HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib)
-
- ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
- TARGET_AR:=$(TARGET_CROSS)gcc-ar
|