X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ba906d9e770b2bbd5a074195568e357ac7122d55..9ac4a336ea3c530bcb9f4a25c2862856f9ca16bc:/include/package.mk diff --git a/include/package.mk b/include/package.mk index 0847528b7..0400d0812 100644 --- a/include/package.mk +++ b/include/package.mk @@ -11,19 +11,19 @@ else endif include $(INCLUDE_DIR)/prereq.mk +include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/unpack.mk + +PKG_CONFIGURE_PATH:=. +export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) - $$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR)) + $$(info Forcing package rebuild) $(PKG_BUILD_DIR)/.prepared: package-clean endif - - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) - $$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1)))) - $(PKG_BUILD_DIR)/.built: package-rebuild - endif endif endif @@ -42,6 +42,10 @@ define Build/DefaultTargets 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 + $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/stampfiles $(call Build/InstallDev) @@ -67,6 +71,7 @@ define Package/Default SECTION:=opt CATEGORY:=Extra packages DEPENDS:= + PROVIDES:= EXTRA_DEPENDS:= MAINTAINER:=OpenWrt Developers Team SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) @@ -89,30 +94,30 @@ define Package/Default DESCRIPTION:= endef +define BuildDescription + ifneq ($(DESCRIPTION),) + DESCRIPTION:=$(TITLE)\\ $(DESCRIPTION) + else + DESCRIPTION:=$(TITLE) + endif +endef + define BuildIPKGVariable - pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) - export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) - $(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi; + $(call shexport,Package/$(1)/$(2)) + $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); endef define BuildPackage $(eval $(call Package/Default)) $(eval $(call Package/$(1))) + $(eval $(call BuildDescription)) - $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, + $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION, ifeq ($($(FIELD)),) $$(error Package/$(1) is missing the $(FIELD) field) endif ) - ifeq ($(PKGARCH),) - PKGARCH:=$(ARCH) - endif - - ifeq ($(DESCRIPTION),) - $(eval DESCRIPTION:=$(TITLE)) - endif - IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list @@ -122,8 +127,12 @@ 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 + $(1)-disabled: + @echo "WARNING: skipping $(1) -- package not selected" endif endif @@ -134,50 +143,68 @@ 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 - DUMPINFO += \ + $(call shexport,Package/$(1)/description) + + DUMPINFO_$(call shvar,$(1)) += \ + if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ echo "Version: $(VERSION)"; \ echo "Depends: $$(IDEPEND_$(1))"; \ - echo "Build-Depends: $(PKG_BUILDDEP)"; \ + echo "Provides: $(PROVIDES)"; \ + echo "Build-Depends: $(PKG_BUILD_DEPENDS)"; \ + echo "Section: $(SECTION)"; \ echo "Category: $(CATEGORY)"; \ echo "Title: $(TITLE)"; \ - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; - + echo "Maintainer: $(MAINTAINER)"; \ + if isset $(call shvar,Package/$(1)/description); then \ + echo -n "Description: "; \ + getvar $(call shvar,Package/$(1)/description); \ + else \ + echo "Description: $(patsubst \\,\\\\,$(DESCRIPTION))" | perl -ne 's/\\/\n/g, print'; \ + fi; + ifneq ($(URL),) - DUMPINFO += \ - echo; \ - echo "$(URL)"; - endif - - DUMPINFO += \ - echo "@@"; - - ifneq ($(CONFIG),) - DUMPINFO += \ - echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \ - echo "@@"; + DUMPINFO_$(call shvar,$(1)) += \ + echo; \ + echo "$(URL)"; endif + + DUMPINFO_$(call shvar,$(1)) += \ + echo "@@"; + + $(call shexport,Package/$(1)/config) + DUMPINFO_$(call shvar,$(1)) += \ + if isset $(call shvar,Package/$(1)/config); then \ + echo "Config: "; \ + getvar $(call shvar,Package/$(1)/config); \ + echo "@@"; \ + fi; + endif $(eval $(call BuildIPKGVariable,$(1),conffiles)) @@ -186,22 +213,23 @@ define BuildPackage $(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),postrm)) $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH) + @rm -f $(PACKAGE_DIR)/$(1)_* mkdir -p $$(IDIR_$(1))/CONTROL 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 echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g' | sed -e 's,^[[:space:]]*$$$$, .,g' >> $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ @@ -226,39 +254,39 @@ define BuildPackage clean: $(1)-clean $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared - -rm $(PKG_BUILD_DIR)/.version-$(1)_* + -@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null @touch $$@ $$(eval $$(call Build/DefaultTargets,$(1))) -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) - + 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))) + $(PKG_BUILD_DIR)/.built: package-rebuild + $$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1)))) + endif + endif + endif + endif endif +endef + +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 endif define Build/Prepare - $(call Build/Prepare/Default) + $(call Build/Prepare/Default,) endef -define Build/Configure/Default - @(cd $(PKG_BUILD_DIR)/$(3); \ - [ -x configure ] && \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - $(2) \ - ./configure \ +CONFIGURE_ARGS := \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ @@ -274,9 +302,26 @@ define Build/Configure/Default --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - $(DISABLE_NLS) \ + $(DISABLE_NLS) + +CONFIGURE_VARS:= \ + $(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" + +define Build/Configure/Default + (cd $(PKG_BUILD_DIR)/$(strip $(3)); \ + if [ -x configure ]; then \ + $(CONFIGURE_VARS) \ + $(2) \ + $(PKG_CONFIGURE_PATH)/configure \ + $(CONFIGURE_ARGS) \ $(1); \ - true; \ + fi; \ ) endef @@ -285,10 +330,12 @@ define Build/Configure endef define Build/Compile/Default + CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \ + LDFLAGS="$(EXTRA_LDFLAGS) " \ $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CROSS="$(TARGET_CROSS)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ + CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \ ARCH="$(ARCH)" \ $(1); endef @@ -298,13 +345,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):