X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage-ipkg.mk;h=9783a632547b827882f0467c699ecca57b3e98e3;hb=f718902f3c508f872c1ff5b94206adea5880d124;hp=696de156cfa98259f0d9754b8fee965f81a137b6;hpb=f7820dc7d8cf9985eb4990af9541aafaa97b9ccf;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 696de156cf..9783a63254 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006,2007 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -64,8 +64,8 @@ ifneq ($(PKG_NAME),toolchain) echo "$$$$FILE" >> $(PKG_INFO_DIR)/$(1).missing; \ done; \ if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \ - echo "Package $(1) is missing dependencies for the following libraries:"; \ - cat "$(PKG_INFO_DIR)/$(1).missing"; \ + echo "Package $(1) is missing dependencies for the following libraries:" >&2; \ + cat "$(PKG_INFO_DIR)/$(1).missing" >&2; \ false; \ fi; \ ) @@ -80,9 +80,12 @@ ifeq ($(DUMP),) ifeq ($(BUILD_VARIANT),$$(if $$(VARIANT),$$(VARIANT),$(BUILD_VARIANT))) ifdef Package/$(1)/install - ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),) + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) IPKGS += $(1) compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(STAGING_DIR_ROOT)/stamp/.$(1)_installed + ifneq ($(ABI_VERSION),) + compile: $(PKG_INFO_DIR)/$(1).version + endif ifeq ($(CONFIG_PACKAGE_$(1)),y) .PHONY: $(PKG_INSTALL_STAMP).$(1) @@ -124,6 +127,10 @@ ifeq ($(DUMP),) rm -rf $(STAGING_DIR_ROOT)/tmp-$(1) touch $$@ + $(PKG_INFO_DIR)/$(1).version: $$(IPKG_$(1)) + echo '$(ABI_VERSION)' | cmp -s - $$@ || \ + echo '$(ABI_VERSION)' > $$@ + $(PKG_INFO_DIR)/$(1).provides: $$(IPKG_$(1)) $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk @rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1)) @@ -152,8 +159,6 @@ ifeq ($(DUMP),) [ -z "$$$$DEPENDS" ] || echo "Depends: $$$$DEPENDS"; \ $(if $(PROVIDES), echo "Provides: $(PROVIDES)"; ) \ echo "Source: $(SOURCE)"; \ - $(if $(PKG_SOURCE), echo "SourceFile: $(PKG_SOURCE)"; ) \ - $(if $(PKG_SOURCE_URL), echo "SourceURL: $(PKG_SOURCE_URL)"; ) \ $(if $(PKG_LICENSE), echo "License: $(PKG_LICENSE)"; ) \ $(if $(PKG_LICENSE_FILES), echo "LicenseFiles: $(PKG_LICENSE_FILES)"; ) \ echo "Section: $(SECTION)"; \