X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/967b579058e9ecb12106a1c4f0fa990b4d37f9e0..91c21e1b4de87a180a1771db35c6445c7d763f49:/include/package-defaults.mk?ds=sidebyside diff --git a/include/package-defaults.mk b/include/package-defaults.mk index e7d74b1ae..649f409f5 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -23,7 +23,11 @@ define Package/Default else VERSION:=$(PKG_RELEASE) endif - PKGARCH:=$(BOARD) + ifneq ($(CONFIG_TARGET_adm5120),y) + PKGARCH:=$(BOARD) + else + PKGARCH:=$(BOARD)_$(ARCH) + endif PRIORITY:=optional DEFAULT:= MENU:= @@ -33,12 +37,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 @@ -61,7 +66,8 @@ CONFIGURE_ARGS = \ --mandir=$(CONFIGURE_PREFIX)/man \ --infodir=$(CONFIGURE_PREFIX)/info \ $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) + $(DISABLE_LARGEFILE) \ + $(DISABLE_IPV6) CONFIGURE_VARS = \ $(TARGET_CONFIGURE_OPTS) \ @@ -84,8 +90,7 @@ define Build/Configure/Default $(2) \ $(CONFIGURE_CMD) \ $(CONFIGURE_ARGS) \ - $(1) \ - $(DISABLE_IPV6); \ + $(1); \ fi; \ ) endef @@ -108,7 +113,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 +122,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