Fix call to make arch-noarch-x.y (#6830)

* Fix call to make arch-noarch-x.y

* noarch log filename fix

* supported.mk: Add make all-supported|latest functionalty to noarch

* patch.mk: Handle noarch architecture

* supported.mk: Use ARCH=noarch instead of ARCH= when applicable

Author: th0ma7

mk/spksrc.common.mk

@@ -144,7 +144,7 @@ ifneq ($(filter 1 on ON,$(PSTAT)),)
 PSTAT_TIME = time -o $(STATUS_LOG) --append --quiet
 endif
 
-DEFAULT_LOG  = $(LOG_DIR)/build$(ARCH_SUFFIX).log
+DEFAULT_LOG  = $(LOG_DIR)/build$(or $(ARCH_SUFFIX),-noarch-$(TCVERSION)).log
 CROSSENV_LOG = $(LOG_DIR)/build$(ARCH_SUFFIX)-crossenv.log
 WHEEL_LOG    = $(LOG_DIR)/build$(ARCH_SUFFIX)-wheel.log
 NATIVE_LOG   = $(LOG_DIR)/build-native-$(PKG_NAME).log

mk/spksrc.patch.mk

@@ -16,20 +16,20 @@ PATCHES_LEVEL = 0
 endif
 
 # find patches into the following directory order:
-#    patches/*.patch      ## this is the only location for native and noarch builds
+#    patches/*.patch                                   ## this is the default location for native
 #    patches/kernel-$(subst +,,$(TC_KERNEL))/*.patch   ## Discard any ending +
 #    patches/DSM-$(TCVERSION)/*.patch
 #    patches/$(group)/*.patch
 #    patches/$(group)-$(TCVERSION)/*.patch
 #    patches/$(arch)/*.patch
 #    patches/$(arch)-$(TCVERSION)/*.patch
-# supported groups: arm, armv5, armv7, armv7l, armv8, ppc, i686, x64
+# supported groups: arm, armv5, armv7, armv7l, armv8, ppc, i686, x64, noarch
 ifeq ($(strip $(PATCHES)),)
-ifeq ($(strip $(ARCH)),)
+ifeq ($(strip $(ARCH)),noarch)
 PATCHES = $(wildcard patches/*.patch)
 else ifneq ($(filter cross diyspk python spk,$(shell basename $(dir $(abspath $(dir $$PWD))))),)
 PATCHES = $(sort $(foreach group,ARM_ARCHS ARMv5_ARCHS ARMv7_ARCHS ARMv7L_ARCHS ARMv8_ARCHS PPC_ARCHS i686_ARCHS x64_ARCHS, \
-	$(foreach arch,$($(group)), \
+	$(foreach arch,$($(group) noarch), \
 	$(if $(filter $(ARCH),$(arch)),$(sort $(wildcard patches/*.patch patches/kernel-$(subst +,,$(TC_KERNEL))/*.patch patches/DSM-$(TCVERSION)/*.patch patches/$(shell echo ${group} | cut -f1 -d'_'| tr '[:upper:]' '[:lower:]')/*.patch  patches/$(shell echo ${group} | cut -f1 -d'_'| tr '[:upper:]' '[:lower:]')-$(TCVERSION)/*.patch patches/$(arch)/*.patch patches/$(arch)-$(TCVERSION)/*.patch)),))))
 else
 PATCHES = $(sort $(wildcard patches/*.patch))

mk/spksrc.supported.mk

@@ -9,13 +9,21 @@ include ../../mk/spksrc.common-rules.mk
 # make all-supported
 ifeq (supported,$(findstring supported,$(subst -, ,$(firstword $(MAKECMDGOALS)))))
 TARGET_TYPE = supported
+ifeq ($(ARCH),noarch)
+TARGET_ARCH = $(addprefix noarch-,$(sort $(foreach version,$(SUPPORTED_ARCHS),$(word 2,$(subst -, ,$(version))))))
+else
 TARGET_ARCH = $(SUPPORTED_ARCHS)
+endif
 
 # make all-latest
 else ifeq (latest,$(findstring latest,$(subst -, ,$(firstword $(MAKECMDGOALS)))))
 TARGET_TYPE = latest
+ifeq ($(ARCH),noarch)
+TARGET_ARCH = $(addprefix noarch-,$(sort $(foreach version,$(LATEST_ARCHS),$(word 2,$(subst -, ,$(version))))))
+else
 TARGET_ARCH = $(LATEST_ARCHS)
 endif
+endif
 
 # error: make setup not invoked
 ifneq ($(strip $(TARGET_TYPE)),)
@@ -50,12 +58,12 @@ pre-build-native:
 $(TARGET_TYPE)-arch-% &: pre-build-native
 	-@MAKEFLAGS= GCC_DEBUG_INFO="$(GCC_DEBUG_INFO)" $(MAKE) arch-$*
 
+arch-noarch-%:
+	$(PSTAT_TIME) $(MAKE) $(addprefix build-noarch-, $(filter $*, $(AVAILABLE_TCVERSIONS) 3.1))
+
 arch-%:
 	$(PSTAT_TIME) $(MAKE) $(addprefix build-arch-, $(or $(filter $(addprefix %, $(DEFAULT_TC)), $(filter %$(word 2,$(subst -, ,$*)), $(filter $(firstword $(subst -, ,$*))%, $(AVAILABLE_TOOLCHAINS)))),$*))
 
-noarch-%:
-	$(PSTAT_TIME) $(MAKE) $(addprefix build-noarch-, $(filter $*, $(AVAILABLE_TCVERSIONS) 3.1))
-
 ####
 
 build-arch-%: SHELL:=/bin/bash
@@ -70,7 +78,7 @@ build-arch-%:
 build-noarch-%: SHELL:=/bin/bash
 build-noarch-%: 
 	@$(MSG) BUILDING noarch package for TCVERSION $*
-	@MAKEFLAGS= $(MAKE) TCVERSION=$* 2>&1 ; \
+	@MAKEFLAGS= $(MAKE) TCVERSION=$* ARCH=noarch 2>&1 ; \
 	status=$${PIPESTATUS[0]} ; \
 	$(MSG) $$(printf "%s MAKELEVEL: %02d, PARALLEL_MAKE: %s, TCVERSION: %s, NAME: %s [END]\n" "$$(date +%Y%m%d-%H%M%S)" $(MAKELEVEL) "$(PARALLEL_MAKE)" "$*" "$(NAME)") | tee --append $(STATUS_LOG) ; \
 	[ $${status[0]} -eq 0 ] || false