X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fhost-build.mk;h=659cdc48374003496d8a7bb2901a93f32952ccc4;hb=663145e419410876f6a962e7f3461ed73eb50831;hp=df7d60611ee07fe95cfd497d093c2938f5105344;hpb=ccb6b0a063a4133ac59c811476b670c7d66f84ed;p=openwrt%2Fstaging%2Fchunkeey.git diff --git a/include/host-build.mk b/include/host-build.mk index df7d60611e..659cdc4837 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -9,11 +9,17 @@ HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSIO 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) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) +else + HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS) +endif + 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),-j$(CONFIG_PKG_BUILD_JOBS),-j1),-j1) + $(if $(CONFIG_PKG_BUILD_PARALLEL),$(HOST_MAKE_J),-j1),-j1) endif include $(INCLUDE_DIR)/host.mk @@ -24,7 +30,8 @@ BUILD_TYPES += host HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built -HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed +HOST_BUILD_PREFIX:=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR)/host,$(STAGING_DIR_HOST)) +HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed override MAKEFLAGS= @@ -44,12 +51,17 @@ 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_CFLAGS)" \ + CPPFLAGS="$(HOST_CPPFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - SHELL="$(BASH)" + SHELL="$(SHELL)" HOST_CONFIGURE_ARGS = \ --target=$(GNU_HOST_NAME) \ @@ -57,16 +69,18 @@ HOST_CONFIGURE_ARGS = \ --build=$(GNU_HOST_NAME) \ --program-prefix="" \ --program-suffix="" \ - --prefix=$(STAGING_DIR_HOST) \ - --exec-prefix=$(STAGING_DIR_HOST) \ - --sysconfdir=$(STAGING_DIR_HOST)/etc \ - --localstatedir=$(STAGING_DIR_HOST)/var \ - --sbindir=$(STAGING_DIR_HOST)/bin + --prefix=$(HOST_BUILD_PREFIX) \ + --exec-prefix=$(HOST_BUILD_PREFIX) \ + --sysconfdir=$(HOST_BUILD_PREFIX)/etc \ + --localstatedir=$(HOST_BUILD_PREFIX)/var \ + --sbindir=$(HOST_BUILD_PREFIX)/bin + +HOST_MAKE_FLAGS = -HOST_CONFIGURE_CMD = ./configure +HOST_CONFIGURE_CMD = $(BASH) ./configure define Host/Configure/Default - (cd $(HOST_BUILD_DIR)/$(3); \ + $(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \ if [ -x configure ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \ $(2) \ @@ -83,7 +97,9 @@ define Host/Configure endef define Host/Compile/Default - $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(1) + +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ + $(HOST_MAKE_FLAGS) \ + $(1) endef define Host/Compile @@ -95,7 +111,7 @@ define Host/Install/Default endef define Host/Install - $(call Host/Install/Default) + $(call Host/Install/Default,$(STAGING_DIR_HOST)) endef @@ -113,16 +129,21 @@ define Download/default 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-*),-I $$(p)) - $(1) : export STAGING_PREFIX=$$(STAGING_DIR_HOST) - $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig - $(1) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR_HOST)/lib/pkgconfig + $(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 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 + $(1) : export CCACHE_DIR:=$(STAGING_DIR_HOST)/ccache + $(if $(IS_PACKAGE_BUILD),$(1) : export PATH=$$(TARGET_PATH_PKG)) endef Host/Exports=$(Host/Exports/Default) +.NOTPARALLEL: + ifndef DUMP define HostBuild $(if $(HOST_QUILT),$(Host/Quilt)) @@ -145,42 +166,32 @@ ifndef DUMP touch $$@ $(call Host/Exports,$(HOST_STAMP_BUILT)) - ifdef Host/Install - host-install: $(if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED)) - endif - - ifndef STAMP_BUILT - prepare: host-prepare - compile: host-compile - install: host-install - clean: host-clean - update: host-update - refresh: host-refresh - - $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep)) $(call Host/Compile) $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep)) touch $$@ - $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE) - $(call Host/Install) + $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE) + $(call Host/Install,$(STAGING_DIR_HOST)) $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) mkdir -p $$(shell dirname $$@) + touch $(HOST_STAMP_BUILT) touch $$@ - else - $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE) - $(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep)) - $(call Host/Compile) - $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep)) - $(call Host/Install) - $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) - touch $$@ + + ifndef STAMP_BUILT + prepare: host-prepare + compile: host-compile + install: host-install + clean: host-clean + update: host-update + refresh: host-refresh endif + host-prepare: $(HOST_STAMP_PREPARED) host-configure: $(HOST_STAMP_CONFIGURED) - host-compile: $(HOST_STAMP_BUILT) - host-install: + host-compile: $(HOST_STAMP_BUILT) $(if $(STAMP_BUILT),$(HOST_STAMP_INSTALLED)) + host-install: $(HOST_STAMP_INSTALLED) host-clean: FORCE $(call Host/Clean) $(call Host/Uninstall)