From 1e26b3651b33db2ed4a2acab23e52ab2e21d7cd0 Mon Sep 17 00:00:00 2001 From: Rejean Loyer Date: Mon, 15 Jun 2020 17:28:45 -0400 Subject: [PATCH 1/4] tarball: use make's --no-print-directory flag. fix make's (sometimes like in artix linux) default behavior of always printing entering and leaving directory messages. we only want them when we specify V=1 for verbose builds. --- crossplatform.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crossplatform.mk b/crossplatform.mk index be269c837d..ee53accad7 100644 --- a/crossplatform.mk +++ b/crossplatform.mk @@ -3,6 +3,10 @@ $(info Using config.mk configuration file.) include config.mk endif +ifndef VERBOSE +MAKEFLAGS += --no-print-directory +endif + # HOST PLATFORM DETECTION ifeq ($(OS),Windows_NT) HOST_PLATFORM := win32 From 4a6577b531f2a40b087368b25fec3185b98519fa Mon Sep 17 00:00:00 2001 From: Rejean Loyer Date: Mon, 16 Sep 2019 23:39:25 -0400 Subject: [PATCH 2/4] tarball/Cleanfile: fix empty recipes as Cleanfile is a little different and some old recipies were left behind. { please squash with d3ded8f52e502a300d4ad7848df09dc6b4836f4a } --- Cleanfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Cleanfile b/Cleanfile index 77d4011ff3..f31008e0e8 100644 --- a/Cleanfile +++ b/Cleanfile @@ -21,9 +21,6 @@ ifeq ($(wildcard $(_SDK_SRC_ROOT)Cleanfile),) _SDK_SRC_ROOT = $(find_sdk_src_root) endif -$(_SDK_SRC_ROOT)Cleanfile: ; -$(_SDK_SRC_ROOT)crossplatform.mk: ; - include $(_SDK_SRC_ROOT)crossplatform.mk subdirs := $(sort $(filter-out .configs obj __pycache__,$(hs_ls_dir))) @@ -64,5 +61,3 @@ ifdef _SDK_SRC_ROOT endif $(MAKEFILE_LIST): ; -$(SOURCES): ; -$(RESOURCES): ; From 71d9ba87b46c939f7a81eeff22b865ff1ded36fe Mon Sep 17 00:00:00 2001 From: Rejean Loyer Date: Mon, 14 Oct 2019 04:09:12 -0400 Subject: [PATCH 3/4] crossplatform.mk: add include guard variable CROSSPLATFORM_MK := defined. --- crossplatform.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crossplatform.mk b/crossplatform.mk index ee53accad7..b00021c53c 100644 --- a/crossplatform.mk +++ b/crossplatform.mk @@ -3,6 +3,8 @@ $(info Using config.mk configuration file.) include config.mk endif +CROSSPLATFORM_MK := defined + ifndef VERBOSE MAKEFLAGS += --no-print-directory endif @@ -316,7 +318,7 @@ endif ifeq ($(D),1) DEBUG_IS_ON := defined endif -addtolistfile = $(if $(1),@$(call echo,$(1)) >> $(2),) +addtolistfile = $(if $(1),@$(call echo,$(1))>> $(2),) ifdef WIN_SHELL_COMMANDS cd = @cd nullerror = 2>NUL From f7008d1d23488ced2f23cb6c2240d75337295a68 Mon Sep 17 00:00:00 2001 From: Rejean Loyer Date: Sat, 25 Apr 2020 02:37:33 -0400 Subject: [PATCH 4/4] tarball: use .NOTPARALLEL to allow 'make wipeclean all -j9' and 'make wipeclean all install -j9' to work properly instead of targets (especially wipeclean and all) interfering with eachother. note: use of .NOTPARALLEL should be expanded to other tarball makefiles and makefile generation. --- Makefile | 2 ++ crossplatform.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 78a0bcc538..86156d64d8 100644 --- a/Makefile +++ b/Makefile @@ -1114,3 +1114,5 @@ troubleshoot: @$(call echo,OPENSSL_BIN_DIR=$(OPENSSL_BIN_DIR)) @$(call echo,ROOT_ABSPATH=$(ROOT_ABSPATH)) @$(call echo,DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH)) + +.NOTPARALLEL: $(NOT_PARALLEL_TARGETS) diff --git a/crossplatform.mk b/crossplatform.mk index b00021c53c..3e9c9e1f14 100644 --- a/crossplatform.mk +++ b/crossplatform.mk @@ -9,6 +9,8 @@ ifndef VERBOSE MAKEFLAGS += --no-print-directory endif +NOT_PARALLEL_TARGETS += clean realclean wipeclean distclean install + # HOST PLATFORM DETECTION ifeq ($(OS),Windows_NT) HOST_PLATFORM := win32