X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=1d29119d81fab0aba0a8f3eab81c430ae99000af;hb=9611bb44757339d8fd827da7b821a984a42a679a;hp=3cba736f0f101d282b4033d1056ebe97f4836e11;hpb=be027bf512d5eb592a61c1228b3c0a4e21ee8a1a;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 3cba736f0f..1d29119d81 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -23,7 +23,16 @@ define Package/Default else VERSION:=$(PKG_RELEASE) endif - PKGARCH:=$(ARCH) + ifneq ($(PKG_FLAGS),) + PKGFLAGS:=$(PKG_FLAGS) + else + PKGFLAGS:= + endif + ifneq ($(ARCH_PACKAGES),) + PKGARCH:=$(ARCH_PACKAGES) + else + PKGARCH:=$(BOARD) + endif PRIORITY:=optional DEFAULT:= MENU:= @@ -33,12 +42,13 @@ define Package/Default KCONFIG:= BUILDONLY:= URL:= + VARIANT:= endef Build/Patch:=$(Build/Patch/Default) ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default - $(PKG_UNPACK) + $(SH_FUNC) $(PKG_UNPACK) $(Build/Patch) endef endif @@ -108,7 +118,7 @@ MAKE_PATH = . define Build/Compile/Default $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_FLAGS) \ $(1); endef @@ -117,7 +127,7 @@ define Build/Install/Default $(MAKE_VARS) \ $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_INSTALL_FLAGS) \ - $(1) install; + $(if $(1), $(1), install); endef define Build/Dist/Default