add prereq check for pkg-config (required by ntfs-3g)

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index e9d73e4..c7b2a43 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -7,6 +7,9 @@
 
 all: $(if $(DUMP),dumpinfo,compile)
 
 
 all: $(if $(DUMP),dumpinfo,compile)
 

+PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
+

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


@@ -14,6 +17,9 @@ include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 

+STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared
+STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
+STAMP_BUILT:=$(PKG_BUILD_DIR)/.built

 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets


@@ -24,46 +30,46 @@ define Build/DefaultTargets
        mkdir -p $(DL_DIR)
        $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
 
        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)
+    $(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)

   endif
 
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR))
         $$(info Forcing package rebuild)
   endif
 
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR))
         $$(info Forcing package rebuild)

-        $(PKG_BUILD_DIR)/.prepared: clean
+        $(STAMP_PREPARED): clean

       endif
     endif
   endif
 
       endif
     endif
   endif
 

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

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

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

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

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

        $(Build/Compile)
        touch $$@
 
   ifdef Build/InstallDev
     ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed $(PKG_BUILD_DIR)),$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed)
        $(Build/Compile)
        touch $$@
 
   ifdef Build/InstallDev
     ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed $(PKG_BUILD_DIR)),$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed)

-      $(PKG_BUILD_DIR)/.built: package-rebuild
+      $(STAMP_BUILT): package-rebuild

     endif
 
     compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
     endif
 
     compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed

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

        mkdir -p $(STAGING_DIR)/stampfiles
        $(Build/InstallDev)
        touch $$@
   endif
 
   package-rebuild: FORCE
        mkdir -p $(STAGING_DIR)/stampfiles
        $(Build/InstallDev)
        touch $$@
   endif
 
   package-rebuild: FORCE

-       @-rm -f $(PKG_BUILD_DIR)/.built
+       @-rm -f $(STAMP_BUILT)

 
   define Build/DefaultTargets
   endef
 
   define Build/DefaultTargets
   endef


@@ -112,8 +118,8 @@ $(PACKAGE_DIR):
                
 dumpinfo:
 download:
                
 dumpinfo:
 download:

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

 compile:
 install:
 clean: FORCE
 compile:
 install:
 clean: FORCE