diff options
Diffstat (limited to '0008-Config.mk-evaluate-XEN_COMPILE_ARCH-and-XEN_OS-immed.patch')
| -rw-r--r-- | 0008-Config.mk-evaluate-XEN_COMPILE_ARCH-and-XEN_OS-immed.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/0008-Config.mk-evaluate-XEN_COMPILE_ARCH-and-XEN_OS-immed.patch b/0008-Config.mk-evaluate-XEN_COMPILE_ARCH-and-XEN_OS-immed.patch new file mode 100644 index 0000000..8a4cb7d --- /dev/null +++ b/0008-Config.mk-evaluate-XEN_COMPILE_ARCH-and-XEN_OS-immed.patch @@ -0,0 +1,50 @@ +From 476d2624ec3cf3e60709580ff1df208bb8f616e2 Mon Sep 17 00:00:00 2001 +From: Anthony PERARD <anthony.perard@citrix.com> +Date: Mon, 31 Jul 2023 15:02:34 +0200 +Subject: [PATCH 08/55] Config.mk: evaluate XEN_COMPILE_ARCH and XEN_OS + immediately + +With GNU make 4.4, the number of execution of the command present in +these $(shell ) increased greatly. This is probably because as of make +4.4, exported variable are also added to the environment of $(shell ) +construct. + +So to avoid having these command been run more than necessary, we +will replace ?= by an equivalent but with immediate expansion. + +Reported-by: Jason Andryuk <jandryuk@gmail.com> +Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> +Tested-by: Jason Andryuk <jandryuk@gmail.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +(cherry picked from commit a07414d989cf52e5e84192b78023bee1589bbda4) +--- + Config.mk | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Config.mk b/Config.mk +index 8bc2bcd5f6..4864033c73 100644 +--- a/Config.mk ++++ b/Config.mk +@@ -19,13 +19,17 @@ or = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$( + + -include $(XEN_ROOT)/.config + +-XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/ \ ++ifeq ($(origin XEN_COMPILE_ARCH), undefined) ++XEN_COMPILE_ARCH := $(shell uname -m | sed -e s/i.86/x86_32/ \ + -e s/i86pc/x86_32/ -e s/amd64/x86_64/ \ + -e s/armv7.*/arm32/ -e s/armv8.*/arm64/ \ + -e s/aarch64/arm64/) ++endif + + XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) +-XEN_OS ?= $(shell uname -s) ++ifeq ($(origin XEN_OS), undefined) ++XEN_OS := $(shell uname -s) ++endif + + CONFIG_$(XEN_OS) := y + +-- +2.42.0 + |