X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage.mk;h=ffab228aae783abdf10a875146e5ff1c24b85a33;hb=f8c85545530d5e71f0b99377d7186eff73a27b89;hp=5a9ba861af1b9fca3cc559455a48ff58b82d2ba6;hpb=711eed53f9d5432ac4b486b7a75ab64a5d29654f;p=openwrt.git diff --git a/include/package.mk b/include/package.mk index 5a9ba861af..ffab228aae 100644 --- a/include/package.mk +++ b/include/package.mk @@ -12,21 +12,16 @@ endif include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/unpack.mk -define shvar -V_$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) -endef - -define shexport -$(call shvar,$(1))=$$(call $(1)) -export $(call shvar,$(1)) -endef +PKG_CONFIG_PATH:=. +export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) _INFO:= - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR)) _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif @@ -77,6 +72,7 @@ define Package/Default SECTION:=opt CATEGORY:=Extra packages DEPENDS:= + PROVIDES:= EXTRA_DEPENDS:= MAINTAINER:=OpenWrt Developers Team SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) @@ -132,7 +128,7 @@ define BuildPackage install-targets: $$(INFO_$(1)) endif - ifneq ($(CONFIG_PACKAGE_$(1)),) + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER)$(SDK),) compile-targets: $$(IPKG_$(1)) else compile-targets: $(1)-disabled @@ -148,34 +144,39 @@ define BuildPackage IDEPEND_$(1):=$$(strip $$(DEPENDS)) ifneq ($(DUMP),) - DUMPINFO += \ + dumpinfo: dumpinfo-$(1) + dumpinfo-$(1): FORCE + @$$(DUMPINFO_$(call shvar,$(1))) + + DUMPINFO_$(call shvar,$(1)) += \ echo "Package: $(1)"; ifneq ($(MENU),) - DUMPINFO += \ + DUMPINFO_$(call shvar,$(1)) += \ echo "Menu: $(MENU)"; endif ifneq ($(SUBMENU),) - DUMPINFO += \ + DUMPINFO_$(call shvar,$(1)) += \ echo "Submenu: $(SUBMENU)"; ifneq ($(SUBMENUDEP),) - DUMPINFO += \ + DUMPINFO_$(call shvar,$(1)) += \ echo "Submenu-Depends: $(SUBMENUDEP)"; endif endif ifneq ($(DEFAULT),) - DUMPINFO += \ + DUMPINFO_$(call shvar,$(1)) += \ echo "Default: $(DEFAULT)"; endif $(call shexport,Package/$(1)/description) - DUMPINFO += \ + DUMPINFO_$(call shvar,$(1)) += \ if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ echo "Version: $(VERSION)"; \ echo "Depends: $$(IDEPEND_$(1))"; \ + echo "Provides: $(PROVIDES)"; \ echo "Build-Depends: $(PKG_BUILDDEP)"; \ echo "Category: $(CATEGORY)"; \ echo "Title: $(TITLE)"; \ @@ -183,22 +184,25 @@ define BuildPackage echo -n "Description: "; \ getvar $(call shvar,Package/$(1)/description); \ else \ - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ + echo "Description: $(patsubst \\,\\\\,$(DESCRIPTION))" | perl -ne 's/\\/\n/g, print'; \ fi; ifneq ($(URL),) - DUMPINFO += \ + DUMPINFO_$(call shvar,$(1)) += \ echo; \ echo "$(URL)"; endif - DUMPINFO += \ + DUMPINFO_$(call shvar,$(1)) += \ echo "@@"; $(call shexport,Package/$(1)/config) - DUMPINFO += \ - if isset $(call shvar,Package/$(1)/config); then echo "Config: "; getvar $(call shvar,Package/$(1)/config); fi; \ - echo "@@"; + DUMPINFO_$(call shvar,$(1)) += \ + if isset $(call shvar,Package/$(1)/config); then \ + echo "Config: "; \ + getvar $(call shvar,Package/$(1)/config); \ + echo "@@"; \ + fi; endif @@ -212,11 +216,11 @@ define BuildPackage echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control ( \ - DEPENDS=; \ + DEPENDS='$(EXTRA_DEPENDS)'; \ for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ done; \ - echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ + echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ ) echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control @@ -248,36 +252,33 @@ define BuildPackage clean: $(1)-clean $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared - -@rm $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null + -@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null @touch $$@ $$(eval $$(call Build/DefaultTargets,$(1))) - ifneq ($$(CONFIG_PACKAGE_$(1)),) - ifneq ($(MAKECMDGOALS),prereq) - ifneq ($(DUMP),1) - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1))) - _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1))) - $(PKG_BUILD_DIR)/.built: package-rebuild - endif - - ifneq ($$(_INFO),) - $$(info Rebuilding $$(_INFO)) + ifdef Package/$(1)/install + ifneq ($$(CONFIG_PACKAGE_$(1))$(DEVELOPER)$(SDK),) + ifneq ($(MAKECMDGOALS),prereq) + ifneq ($(DUMP),1) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1))) + _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1))) + $(PKG_BUILD_DIR)/.built: package-rebuild + endif + + ifneq ($$(_INFO),) + $$(info Rebuilding $$(_INFO)) + endif endif endif endif endif endef -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 +ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default - $(UNPACK) - @if [ -d ./patches ]; then \ + $(PKG_UNPACK) + @if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \ $(PATCH) $(PKG_BUILD_DIR) ./patches; \ fi endef @@ -288,16 +289,16 @@ define Build/Prepare endef define Build/Configure/Default - (cd $(PKG_BUILD_DIR)/$(3); \ + (cd $(PKG_BUILD_DIR)/$(strip $(3)); \ if [ -x configure ]; then \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ + PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ $(2) \ - ./configure \ + $(PKG_CONFIG_PATH)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ @@ -338,13 +339,12 @@ define Build/Compile endef ifneq ($(DUMP),) - dumpinfo: FORCE - @$(DUMPINFO) + dumpinfo: else $(PACKAGE_DIR): mkdir -p $@ - ifneq ($(strip $(PKG_SOURCE)),) + ifneq ($(strip $(PKG_SOURCE_URL)),) download: $(DL_DIR)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE):