[tools] cleanup imagetag

[openwrt.git] / include / host-build.mk

diff --git a/include/host-build.mk b/include/host-build.mk
index 5670b6f..3d1983b 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -1,140 +1,152 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 

-include $(TOPDIR)/.host.mk
-
-$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host-build.mk
-       echo "HOST_OS:=`uname`" > $@
-       echo "HOST_ARCH:=` \
-               $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-                       -e 's/sparc.*/sparc/' \
-                       -e 's/arm.*/arm/' \
-                       -e 's/m68k.*/m68k/' \
-                       -e 's/ppc/powerpc/' \
-                       -e 's/v850.*/v850/' \
-                       -e 's/sh[234]/sh/' \
-                       -e 's/mips-.*/mips/' \
-                       -e 's/mipsel-.*/mipsel/' \
-                       -e 's/cris.*/cris/' \
-                       -e 's/i[3-9]86/i386/'`" >> $@
-       echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@
-
-
-ifneq ($(strip $(PKG_CAT)),)
-  ifeq ($(PKG_CAT),unzip)
-    UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
-  else
-    UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
-  endif
-  define Build/Prepare/Default
-       $(UNPACK)
-       @if [ -d ./patches ]; then \
-               $(PATCH) $(PKG_BUILD_DIR) ./patches; \
-       fi
+HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
+
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/depends.mk
+
+BUILD_TYPES += host
+HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
+HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
+HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
+HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed
+
+override MAKEFLAGS=
+
+include $(INCLUDE_DIR)/download.mk
+include $(INCLUDE_DIR)/quilt.mk
+
+Host/Patch:=$(Host/Patch/Default)
+ifneq ($(strip $(HOST_UNPACK)),)
+  define Host/Prepare/Default
+       $(HOST_UNPACK)
+       $(Host/Patch)

   endef
 endif
 
   endef
 endif
 

-define Build/Prepare
-  $(call Build/Prepare/Default)
+define Host/Prepare
+  $(call Host/Prepare/Default)

 endef
 
 endef
 

-define Build/Configure/Default
-       @(cd $(PKG_BUILD_DIR)/$(3); \
-       [ -x configure ] && \
-               $(2) \
-               CPPFLAGS="-I$(STAGING_DIR)/host/include" \
-               LDFLAGS="-L$(STAGING_DIR)/host/lib" \
-               ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --program-prefix="" \
-               --program-suffix="" \
-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --sbindir=/usr/sbin \
-               --libexecdir=/usr/lib \
-               --sysconfdir=/etc \
-               --datadir=/usr/share \
-               --localstatedir=/var \
-               --mandir=/usr/man \
-               --infodir=/usr/info \
-               $(DISABLE_NLS) \
-               $(1); \
-               true; \
+HOST_CONFIGURE_VARS = \
+       CPPFLAGS="$(HOST_CFLAGS)" \
+       LDFLAGS="$(HOST_LDFLAGS)" \
+       SHELL="$(BASH)"
+
+HOST_CONFIGURE_ARGS = \
+       --target=$(GNU_HOST_NAME) \
+       --host=$(GNU_HOST_NAME) \
+       --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
+
+HOST_CONFIGURE_CMD = ./configure
+
+define Host/Configure/Default
+       @(cd $(HOST_BUILD_DIR)/$(3); \
+               if [ -x configure ]; then \
+                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \
+                       $(2) \
+                       $(HOST_CONFIGURE_CMD) \
+                       $(HOST_CONFIGURE_VARS) \
+                       $(HOST_CONFIGURE_ARGS) \
+                       $(1); \
+               fi \

        )
 endef
 
        )
 endef
 

-define Build/Configure
-  $(call Build/Configure/Default)
+define Host/Configure
+  $(call Host/Configure/Default)

 endef
 
 endef
 

-define Build/Compile/Default
-       $(MAKE) -C $(PKG_BUILD_DIR) $(1)
+define Host/Compile/Default
+       $(MAKE) -C $(HOST_BUILD_DIR) $(1)

 endef
 
 endef
 

-define Build/Compile
-  $(call Build/Compile/Default)
+define Host/Compile
+  $(call Host/Compile/Default)

 endef
 
 endef
 

-               
-ifneq ($(strip $(PKG_SOURCE)),)
-  download: $(DL_DIR)/$(PKG_SOURCE)
+ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
+  define HostHost/Autoclean
+    $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(HOST_STAMP_PREPARED))
+    $(if $(if $(Host/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(HOST_BUILD_DIR),$(HOST_STAMP_BUILT)))
+  endef
+endif

 
 

-  $(DL_DIR)/$(PKG_SOURCE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
+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)
+endef

 
 

-  $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-endif
+ifndef DUMP
+  define HostBuild
+  $(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))

 
 

-define HostBuild
-  $(PKG_BUILD_DIR)/.prepared:
-       @-rm -rf $(PKG_BUILD_DIR)
-       @mkdir -p $(PKG_BUILD_DIR)
-       $(call Build/Prepare)
+  $(HOST_STAMP_PREPARED):
+       @-rm -rf $(HOST_BUILD_DIR)
+       @mkdir -p $(HOST_BUILD_DIR)
+       $(call Host/Prepare)

        touch $$@
 
        touch $$@
 

-  $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-       $(call Build/Configure)
+  $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED)
+       $(call Host/Configure)

        touch $$@
 
        touch $$@
 

-  $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(call Build/Compile)
+  $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
+       $(call Host/Compile)

        touch $$@
 
        touch $$@
 

-  $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
-       $(call Build/Install)
+  $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT)
+       $(call Host/Install)
+       mkdir -p $$(shell dirname $$@)

        touch $$@
        touch $$@

-       
-  ifdef Build/Install
-    install-targets: $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
-  endif

 
 

-  package-clean: FORCE
-       $(call Build/Clean)
-       $(call Build/Uninstall)
-       rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
+  ifdef Host/Install
+    host-install: $(HOST_STAMP_INSTALLED)
+  endif

 
 

-  download:
-  prepare: $(PKG_BUILD_DIR)/.prepared
-  configure: $(PKG_BUILD_DIR)/.configured
+  ifndef STAMP_BUILT
+    prepare: host-prepare
+    compile: host-compile
+    install: host-install
+    clean: host-clean
+  else
+    host-compile: $(HOST_STAMP_INSTALLED)
+  endif
+  host-prepare: $(HOST_STAMP_PREPARED)
+  host-configure: $(HOST_STAMP_CONFIGURED)
+  host-compile: $(HOST_STAMP_BUILT)
+  host-install:
+  host-clean: FORCE
+       $(call Host/Clean)
+       $(call Host/Uninstall)
+       rm -rf $(HOST_BUILD_DIR) $(HOST_STAMP_INSTALLED) $(HOST_STAMP_BUILT)

 
 

-  compile-targets: $(PKG_BUILD_DIR)/.built
-  compile: compile-targets
+  endef

 
 

-  install-targets:
-  install: install-targets
+  download:
+  prepare:
+  compile:
+  install:
+  clean:

 
 

-  clean-targets:
-  clean: FORCE
-       @$(MAKE) clean-targets
-       $(call Build/Clean)
-       rm -rf $(PKG_BUILD_DIR)
+endif

 
 

-endef