[kernel] netfilter: fix compiler warnings in xt_layer7

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

diff --git a/include/host-build.mk b/include/host-build.mk
index 5670b6f..8a8d6de 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -1,40 +1,33 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2007 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
+PKG_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/host-install
+
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/depends.mk
+
+STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
+STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
+STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
+STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed
+
+override MAKEFLAGS=
+
+include $(INCLUDE_DIR)/download.mk
+include $(INCLUDE_DIR)/quilt.mk
+
+Build/Patch:=$(Build/Patch/Default)
+ifneq ($(strip $(PKG_UNPACK)),)

   define Build/Prepare/Default
   define Build/Prepare/Default

-       $(UNPACK)
-       @if [ -d ./patches ]; then \
-               $(PATCH) $(PKG_BUILD_DIR) ./patches; \
-       fi
+       $(PKG_UNPACK)
+       $(Build/Patch)
+       $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)

   endef
 endif
 
   endef
 endif
 


@@ -45,25 +38,21 @@ endef
 define Build/Configure/Default
        @(cd $(PKG_BUILD_DIR)/$(3); \
        [ -x configure ] && \
 define Build/Configure/Default
        @(cd $(PKG_BUILD_DIR)/$(3); \
        [ -x configure ] && \

+               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \

                $(2) \
                $(2) \

-               CPPFLAGS="-I$(STAGING_DIR)/host/include" \
-               LDFLAGS="-L$(STAGING_DIR)/host/lib" \
+               CPPFLAGS="$(HOST_CFLAGS)" \
+               LDFLAGS="$(HOST_LDFLAGS)" \
+               SHELL="$(BASH)" \

                ./configure \
                ./configure \

-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
+               --target=$(GNU_HOST_NAME) \
+               --host=$(GNU_HOST_NAME) \

                --build=$(GNU_HOST_NAME) \
                --program-prefix="" \
                --program-suffix="" \
                --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 \
+               --prefix=$(STAGING_DIR_HOST) \
+               --exec-prefix=$(STAGING_DIR_HOST) \
+               --sysconfdir=$(STAGING_DIR_HOST)/etc \
+               --localstatedir=$(STAGING_DIR_HOST)/var \

                $(DISABLE_NLS) \
                $(1); \
                true; \
                $(DISABLE_NLS) \
                $(1); \
                true; \


@@ -82,58 +71,60 @@ define Build/Compile
   $(call Build/Compile/Default)
 endef
 
   $(call Build/Compile/Default)
 endef
 

-               
-ifneq ($(strip $(PKG_SOURCE)),)
-  download: $(DL_DIR)/$(PKG_SOURCE)
-
-  $(DL_DIR)/$(PKG_SOURCE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
-
-  $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
+ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
+  define HostBuild/Autoclean
+    $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
+    $(if $(if $(Build/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT)))
+  endef

 endif
 
 endif
 

+define Download/default
+  FILE:=$(PKG_SOURCE)
+  URL:=$(PKG_SOURCE_URL)
+  PROTO:=$(PKG_SOURCE_PROTO)
+  VERSION:=$(PKG_SOURCE_VERSION)
+  MD5SUM:=$(PKG_MD5SUM)
+endef
+

 define HostBuild
 define HostBuild

-  $(PKG_BUILD_DIR)/.prepared:
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
+  $(if $(DUMP),,$(call HostBuild/Autoclean))
+  
+  $(STAMP_PREPARED):

        @-rm -rf $(PKG_BUILD_DIR)
        @mkdir -p $(PKG_BUILD_DIR)
        $(call Build/Prepare)
        touch $$@
 
        @-rm -rf $(PKG_BUILD_DIR)
        @mkdir -p $(PKG_BUILD_DIR)
        $(call Build/Prepare)
        touch $$@
 

-  $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED)

        $(call Build/Configure)
        touch $$@
 
        $(call Build/Configure)
        touch $$@
 

-  $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+  $(STAMP_BUILT): $(STAMP_CONFIGURED)

        $(call Build/Compile)
        touch $$@
 
        $(call Build/Compile)
        touch $$@
 

-  $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
+  $(STAMP_INSTALLED): $(STAMP_BUILT)

        $(call Build/Install)
        $(call Build/Install)

+       mkdir -p $$(shell dirname $$@)

        touch $$@
        
   ifdef Build/Install
        touch $$@
        
   ifdef Build/Install

-    install-targets: $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
+    install: $(STAMP_INSTALLED)

   endif
 
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/Uninstall)
   endif
 
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/Uninstall)

-       rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
+       rm -f $(STAMP_INSTALLED) $(STAMP_BUILT)

 
   download:
 
   download:

-  prepare: $(PKG_BUILD_DIR)/.prepared
-  configure: $(PKG_BUILD_DIR)/.configured
-
-  compile-targets: $(PKG_BUILD_DIR)/.built
-  compile: compile-targets
-
-  install-targets:
-  install: install-targets
-
-  clean-targets:
+  prepare: $(STAMP_PREPARED)
+  configure: $(STAMP_CONFIGURED)
+  compile: $(STAMP_BUILT)
+  install:

   clean: FORCE
   clean: FORCE

-       @$(MAKE) clean-targets

        $(call Build/Clean)
        rm -rf $(PKG_BUILD_DIR)
 
        $(call Build/Clean)
        rm -rf $(PKG_BUILD_DIR)