fix packages that use -f on other build system makefiles

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 591816b..7f9437c 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -16,17 +16,23 @@ include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.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_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_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built

+STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed

 
 

+include $(INCLUDE_DIR)/download.mk

 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)/quilt.mk
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk

+include $(INCLUDE_DIR)/package-bin.mk
+include $(INCLUDE_DIR)/autotools.mk

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

+CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
+SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))

 
 ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
 
 ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)


@@ -38,55 +44,80 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   endif
 endif
 
   endif
 endif
 

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

 
 

-define Build/DefaultTargets
-  ifneq ($(strip $(PKG_SOURCE_URL)),)
-    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)
+define sep

 
 

-    $(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)
-  endif
+endef

 
 

+define Build/DefaultTargets
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))

   $(call Build/Autoclean)
 
   $(STAMP_PREPARED):
        @-rm -rf $(PKG_BUILD_DIR)
        @mkdir -p $(PKG_BUILD_DIR)
   $(call Build/Autoclean)
 
   $(STAMP_PREPARED):
        @-rm -rf $(PKG_BUILD_DIR)
        @mkdir -p $(PKG_BUILD_DIR)

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

        $(Build/Prepare)
        $(Build/Prepare)

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

        touch $$@
 
   $(STAMP_CONFIGURED): $(STAMP_PREPARED)
        touch $$@
 
   $(STAMP_CONFIGURED): $(STAMP_PREPARED)

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

        $(Build/Configure)
        $(Build/Configure)

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

        touch $$@
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
        touch $$@
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)

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

        $(Build/Compile)
        $(Build/Compile)

-       $(Build/InstallDev)
+       $(foreach hook,$(Hooks/Compile/Post),$(call $(hook))$(sep))
+       touch $$@
+
+  $(STAMP_INSTALLED): $(STAMP_BUILT)
+       $(SUBMAKE) clean-staging
+       rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
+       mkdir -p $(TMP_DIR)/stage-$(PKG_NAME)/host $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages
+       $(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)
+       if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \
+               (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(PKG_NAME).list); \
+               $(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
+       fi
+       rm -rf $(TMP_DIR)/stage-$(PKG_NAME)

        touch $$@
 
   ifdef Build/InstallDev
        touch $$@
 
   ifdef Build/InstallDev

-    compile: $(STAMP_BUILT)
+    compile: $(STAMP_INSTALLED)

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

+
+  prepare: $(STAMP_PREPARED)
+  configure: $(STAMP_CONFIGURED)

 endef
 
 define BuildPackage
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 
 endef
 
 define BuildPackage
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 

-# <HACK> Support obsolete DESCRIPTION field
+ifdef DESCRIPTION
+$$(error DESCRIPTION:= is obselete, use Package/PKG_NAME/description)
+endif
+

 ifndef Package/$(1)/description
 define Package/$(1)/description
 ifndef Package/$(1)/description
 define Package/$(1)/description

-$(TITLE)$(subst \,
-,\ $(DESCRIPTION))
+       $(TITLE)

 endef
 endif
 endef
 endif

-# </HACK>

 
   $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION,
     ifeq ($($(FIELD)),)
 
   $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION,
     ifeq ($($(FIELD)),)


@@ -97,20 +128,23 @@ endif
   $(call shexport,Package/$(1)/description)
   $(call shexport,Package/$(1)/config)
 
   $(call shexport,Package/$(1)/description)
   $(call shexport,Package/$(1)/config)
 

-  $(Dumpinfo)
-  $(BuildIPKG)
+  $(if $(DUMP), \
+    $(Dumpinfo), \
+    $(foreach target, \
+      $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \
+        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg ) \
+      ), $(BuildTarget/$(target)) \
+    ) \
+  )
+  $(if $(DUMP),,$(call Build/DefaultTargets,$(1)))

 endef
 
 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'
+define pkg_install_files
+       $(foreach install_file,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_file)`; $(INSTALL_DATA) $(2)/$(install_file) $(3)/`dirname $(install_file)`;)

 endef
 
 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"
+define pkg_install_bin
+       $(foreach install_apps,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_apps)`; $(INSTALL_BIN) $(2)/$(install_apps) $(3)/`dirname $(install_apps)`;)

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -127,15 +161,24 @@ endef
 
 $(PACKAGE_DIR):
        mkdir -p $@
 
 $(PACKAGE_DIR):
        mkdir -p $@

-               
+       

 dumpinfo:
 download:
 dumpinfo:
 download:

-prepare: $(STAMP_PREPARED)
-configure: $(STAMP_CONFIGURED)
+prepare:
+configure:

 compile:
 install:
 compile:
 install:

-clean: FORCE
-       $(Build/UninstallDev)
+clean-staging: FORCE
+       rm -f $(STAMP_INSTALLED)
+       @-(\
+               cd "$(STAGING_DIR)"; \
+               if [ -f packages/$(PKG_NAME).list ]; then \
+                       cat packages/$(PKG_NAME).list | xargs -r rm -f 2>/dev/null; \
+               fi; \
+       )
+
+clean: clean-staging FORCE
+       $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))

        $(Build/Clean)
        $(Build/Clean)

-       @rm -f $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed
-       @rm -rf $(PKG_BUILD_DIR)
+       rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list
+       rm -rf $(PKG_BUILD_DIR)