[package] libpcap: explicitely disable libnl support to prevent different build resul...

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

diff --git a/include/host-build.mk b/include/host-build.mk
index 6324276..df7d606 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 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.


@@ -7,6 +7,14 @@
 
 HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
 
 HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install

+HOST_BUILD_PARALLEL ?=
+
+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)
+endif

 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk


@@ -22,6 +30,7 @@ override MAKEFLAGS=
 
 include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
 
 include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk

+include $(INCLUDE_DIR)/autotools.mk

 
 Host/Patch:=$(Host/Patch/Default)
 ifneq ($(strip $(HOST_UNPACK)),)
 
 Host/Patch:=$(Host/Patch/Default)
 ifneq ($(strip $(HOST_UNPACK)),)


@@ -36,6 +45,7 @@ define Host/Prepare
 endef
 
 HOST_CONFIGURE_VARS = \
 endef
 
 HOST_CONFIGURE_VARS = \

+       CC="$(HOSTCC)" \

        CFLAGS="$(HOST_CFLAGS)" \
        CPPFLAGS="$(HOST_CFLAGS)" \
        LDFLAGS="$(HOST_LDFLAGS)" \
        CFLAGS="$(HOST_CFLAGS)" \
        CPPFLAGS="$(HOST_CFLAGS)" \
        LDFLAGS="$(HOST_LDFLAGS)" \


@@ -50,7 +60,8 @@ HOST_CONFIGURE_ARGS = \
        --prefix=$(STAGING_DIR_HOST) \
        --exec-prefix=$(STAGING_DIR_HOST) \
        --sysconfdir=$(STAGING_DIR_HOST)/etc \
        --prefix=$(STAGING_DIR_HOST) \
        --exec-prefix=$(STAGING_DIR_HOST) \
        --sysconfdir=$(STAGING_DIR_HOST)/etc \

-       --localstatedir=$(STAGING_DIR_HOST)/var
+       --localstatedir=$(STAGING_DIR_HOST)/var \
+       --sbindir=$(STAGING_DIR_HOST)/bin

 
 HOST_CONFIGURE_CMD = ./configure
 
 
 HOST_CONFIGURE_CMD = ./configure
 


@@ -72,7 +83,7 @@ define Host/Configure
 endef
 
 define Host/Compile/Default
 endef
 
 define Host/Compile/Default

-       $(MAKE) -C $(HOST_BUILD_DIR) $(1)
+       $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(1)

 endef
 
 define Host/Compile
 endef
 
 define Host/Compile


@@ -80,7 +91,7 @@ define Host/Compile
 endef
 
 define Host/Install/Default
 endef
 
 define Host/Install/Default

-       $(MAKE) -C $(HOST_BUILD_DIR) install
+       $(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install

 endef
 
 define Host/Install
 endef
 
 define Host/Install


@@ -121,12 +132,16 @@ ifndef DUMP
   $(HOST_STAMP_PREPARED):
        @-rm -rf $(HOST_BUILD_DIR)
        @mkdir -p $(HOST_BUILD_DIR)
   $(HOST_STAMP_PREPARED):
        @-rm -rf $(HOST_BUILD_DIR)
        @mkdir -p $(HOST_BUILD_DIR)

+       $(foreach hook,$(Hooks/HostPrepare/Pre),$(call $(hook))$(sep))

        $(call Host/Prepare)
        $(call Host/Prepare)

+       $(foreach hook,$(Hooks/HostPrepare/Post),$(call $(hook))$(sep))

        touch $$@
 
   $(call Host/Exports,$(HOST_STAMP_CONFIGURED))
   $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED)
        touch $$@
 
   $(call Host/Exports,$(HOST_STAMP_CONFIGURED))
   $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED)

+       $(foreach hook,$(Hooks/HostConfigure/Pre),$(call $(hook))$(sep))

        $(call Host/Configure)
        $(call Host/Configure)

+       $(foreach hook,$(Hooks/HostConfigure/Post),$(call $(hook))$(sep))

        touch $$@
 
   $(call Host/Exports,$(HOST_STAMP_BUILT))
        touch $$@
 
   $(call Host/Exports,$(HOST_STAMP_BUILT))


@@ -140,19 +155,26 @@ ifndef DUMP
     install: host-install
     clean: host-clean
     update: host-update
     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)
                $(call Host/Compile)

+               $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep))

                touch $$@
 
                touch $$@
 

-    $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT)
+    $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)

                $(call Host/Install)
                $(call Host/Install)

+               $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))

                mkdir -p $$(shell dirname $$@)
                touch $$@
   else
                mkdir -p $$(shell dirname $$@)
                touch $$@
   else

-    $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
+    $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE)
+               $(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep))

                $(call Host/Compile)
                $(call Host/Compile)

+               $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep))

                $(call Host/Install)
                $(call Host/Install)

+               $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))

                touch $$@
   endif
   host-prepare: $(HOST_STAMP_PREPARED)
                touch $$@
   endif
   host-prepare: $(HOST_STAMP_PREPARED)


@@ -173,4 +195,3 @@ ifndef DUMP
   clean:
 
 endif
   clean:
 
 endif

-