X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=include%2Fhost-build.mk;h=dc7037385563a3490d5f259a63068155798c288e;hp=456b418f86708aaa06db590336716fd21b6d8441;hb=fde7688055405e64637595e8b1936e8eaec242f7;hpb=03bc8d94f0d0579cf6de35d719b96f6b3df3345d diff --git a/include/host-build.mk b/include/host-build.mk index 456b418f86..dc70373855 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -5,44 +5,42 @@ # See /LICENSE for more information. # +include $(INCLUDE_DIR)/download.mk + HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install HOST_BUILD_PARALLEL ?= -ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),) - HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j) -else - HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS) -endif +HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) ifeq ($(strip $(HOST_BUILD_PARALLEL)),0) HOST_JOBS?=-j1 else -HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\ - $(if $(CONFIG_PKG_BUILD_PARALLEL),$(HOST_MAKE_J),-j1),-j1) +HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL),$(HOST_MAKE_J),-j1) endif -include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk +include $(INCLUDE_DIR)/quilt.mk BUILD_TYPES += host -HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) +HOST_STAMP_PREPARED:=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))_$(call confvar,CONFIG_AUTOREMOVE $(HOST_PREPARED_DEPENDS))) HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built -HOST_BUILD_PREFIX:=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR)/host,$(STAGING_DIR_HOST)) +HOST_BUILD_PREFIX?=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST)) HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed override MAKEFLAGS= -include $(INCLUDE_DIR)/download.mk -include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/autotools.mk +_host_target:=$(if $(HOST_QUILT),,.) + Host/Patch:=$(Host/Patch/Default) ifneq ($(strip $(HOST_UNPACK)),) define Host/Prepare/Default $(HOST_UNPACK) + [ ! -d ./src/ ] || $(CP) ./src/* $(HOST_BUILD_DIR) $(Host/Patch) endef endif @@ -51,17 +49,12 @@ define Host/Prepare $(call Host/Prepare/Default) endef -ifeq ($(HOST_OS),Darwin) - HOST_CFLAGS += -I/usr/local/opt/openssl/include - HOST_LDFLAGS += -L/usr/local/opt/openssl/lib -endif - HOST_CONFIGURE_VARS = \ CC="$(HOSTCC)" \ CFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(HOST_CPPFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - SHELL="$(SHELL)" + CONFIG_SHELL="$(SHELL)" HOST_CONFIGURE_ARGS = \ --target=$(GNU_HOST_NAME) \ @@ -75,6 +68,12 @@ HOST_CONFIGURE_ARGS = \ --localstatedir=$(HOST_BUILD_PREFIX)/var \ --sbindir=$(HOST_BUILD_PREFIX)/bin +HOST_MAKE_VARS = \ + CFLAGS="$(HOST_CFLAGS)" \ + CPPFLAGS="$(HOST_CPPFLAGS)" \ + CXXFLAGS="$(HOST_CXXFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" + HOST_MAKE_FLAGS = HOST_CONFIGURE_CMD = $(BASH) ./configure @@ -83,9 +82,9 @@ define Host/Configure/Default $(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \ if [ -x configure ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \ + $(HOST_CONFIGURE_VARS) \ $(2) \ $(HOST_CONFIGURE_CMD) \ - $(HOST_CONFIGURE_VARS) \ $(HOST_CONFIGURE_ARGS) \ $(1); \ fi \ @@ -97,7 +96,8 @@ define Host/Configure endef define Host/Compile/Default - +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ + +$(HOST_MAKE_VARS) \ + $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ $(HOST_MAKE_FLAGS) \ $(1) endef @@ -107,11 +107,11 @@ define Host/Compile endef define Host/Install/Default - $(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install + $(call Host/Compile/Default,install) endef define Host/Install - $(call Host/Install/Default) + $(call Host/Install/Default,$(HOST_BUILD_PREFIX)) endef @@ -122,18 +122,8 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),) endef endif -define Download/default - FILE:=$(PKG_SOURCE) - URL:=$(PKG_SOURCE_URL) - PROTO:=$(PKG_SOURCE_PROTO) - SUBDIR:=$(PKG_SOURCE_SUBDIR) - VERSION:=$(PKG_SOURCE_VERSION) - MD5SUM:=$(PKG_MD5SUM) - MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM) -endef - 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 @@ -145,9 +135,8 @@ Host/Exports=$(Host/Exports/Default) .NOTPARALLEL: ifndef DUMP - define HostBuild + define HostBuild/Core $(if $(HOST_QUILT),$(Host/Quilt)) - $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) $(if $(DUMP),,$(call HostHost/Autoclean)) $(HOST_STAMP_PREPARED): @@ -172,37 +161,45 @@ ifndef DUMP $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep)) touch $$@ + $(call Host/Exports,$(HOST_STAMP_INSTALLED)) $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE) - $(call Host/Install) + $(call Host/Install,$(HOST_BUILD_PREFIX)) $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) mkdir -p $$(shell dirname $$@) touch $(HOST_STAMP_BUILT) touch $$@ + $(call DefaultTargets,$(patsubst %,host-%,$(DEFAULT_SUBDIR_TARGETS))) ifndef STAMP_BUILT - prepare: host-prepare - compile: host-compile - install: host-install - clean: host-clean - update: host-update - refresh: host-refresh + $(foreach t,$(DEFAULT_SUBDIR_TARGETS), + $(t): host-$(t) + .$(t): .host-$(t) + ) + clean-build: host-clean-build endif - host-prepare: $(HOST_STAMP_PREPARED) - host-configure: $(HOST_STAMP_CONFIGURED) - host-compile: $(HOST_STAMP_BUILT) $(if $(STAMP_BUILT),$(HOST_STAMP_INSTALLED)) - host-install: $(HOST_STAMP_INSTALLED) - host-clean: FORCE + $(_host_target)host-prepare: $(HOST_STAMP_PREPARED) + $(_host_target)host-configure: $(HOST_STAMP_CONFIGURED) + $(_host_target)host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED) + host-install: host-compile + + host-clean-build: FORCE + rm -rf $(HOST_BUILD_DIR) $(HOST_STAMP_BUILT) + + host-clean: host-clean-build $(call Host/Clean) $(call Host/Uninstall) - rm -rf $(HOST_BUILD_DIR) $(HOST_STAMP_INSTALLED) $(HOST_STAMP_BUILT) + rm -rf $(HOST_STAMP_INSTALLED) + ifneq ($(CONFIG_AUTOREMOVE),) + host-compile: + $(FIND) $(HOST_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' | \ + $(XARGS) rm -rf + endif endef - - download: - prepare: - compile: - install: - clean: - endif + +define HostBuild + $(HostBuild/Core) + $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) +endef