Package wpa-passphrase (#1275)

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 44fe33a..591816b 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -1,5 +1,5 @@
 # 
 # 

-# Copyright (C) 2006,2007 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.


@@ -7,18 +7,38 @@
 
 all: $(if $(DUMP),dumpinfo,compile)
 
 
 all: $(if $(DUMP),dumpinfo,compile)
 

-PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))

 PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
 PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install

+PKG_MD5SUM ?= unknown

 
 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

+include $(INCLUDE_DIR)/depends.mk
+
+STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared$(if $(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
+STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
+STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
+
+include $(INCLUDE_DIR)/quilt.mk

 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 

+override MAKEFLAGS=

 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 

+ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
+  ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
+    define Build/Autoclean
+      $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
+      $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED),$(PKG_BUILD_DIR)/.dep_files,-x "*/.dep_*")
+      $(if $(filter prepare,$(MAKECMDGOALS)),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),,-x "*/.dep_*" -x "*/ipkg*"))
+    endef
+  endif
+endif
+
+

 define Build/DefaultTargets
   ifneq ($(strip $(PKG_SOURCE_URL)),)
     download: $(DL_DIR)/$(PKG_SOURCE)
 define Build/DefaultTargets
   ifneq ($(strip $(PKG_SOURCE_URL)),)
     download: $(DL_DIR)/$(PKG_SOURCE)


@@ -27,47 +47,30 @@ 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
 
   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
-      endif
-    endif
-  endif
+  $(call Build/Autoclean)

 
 

-  $(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)
        $(Build/Compile)

+       $(Build/InstallDev)

        touch $$@
 
   ifdef Build/InstallDev
        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
-    endif
-
-    compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
-    $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
-       mkdir -p $(STAGING_DIR)/stampfiles
-       $(Build/InstallDev)
-       touch $$@
+    compile: $(STAMP_BUILT)

   endif
 
   endif
 

-  package-rebuild: FORCE
-       @-rm -f $(PKG_BUILD_DIR)/.built
-

   define Build/DefaultTargets
   endef
 endef
   define Build/DefaultTargets
   endef
 endef


@@ -98,6 +101,18 @@ endif
   $(BuildIPKG)
 endef
 
   $(BuildIPKG)
 endef
 

+# prevent libtool from setting rpath when linking
+define libtool_disable_rpath
+       find $(PKG_BUILD_DIR) -name 'libtool' | $(XARGS) \
+               $(SED) 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ ",g'
+endef
+
+# prevent libtool from linking against host development libraries
+define libtool_fixup_libdir
+       find $(PKG_BUILD_DIR) -name '*.la' | $(XARGS) \
+               $(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
+endef
+

 define Build/Prepare
   $(call Build/Prepare/Default,)
 endef
 define Build/Prepare
   $(call Build/Prepare/Default,)
 endef


@@ -115,11 +130,12 @@ $(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
        $(Build/UninstallDev)
 compile:
 install:
 clean: FORCE
        $(Build/UninstallDev)

-       @rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
+       $(Build/Clean)
+       @rm -f $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed

        @rm -rf $(PKG_BUILD_DIR)
        @rm -rf $(PKG_BUILD_DIR)