Skip to contentSkip to conversation

kbuild: add test-{le,ge,lt,gt} macros

PATCH In review Masahiro Yamada 3 participants 10 messages Nov 26, 2022 – Dec 12, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/5 kbuild: add test-{le,ge,lt,gt} macros

Because GNU Make is handle strings, it is very hard to perform math in Makefiles.

When we compare two integers, we invokes shell. One example is in the top Makefile:

  ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)

This is more expensive than using built-in functions since it forks a process.

If we know the two have the same number of digits, we can do better.

This commit adds four macros, test-le, test-ge, test-lt, test-gt.

$(call test-lt, A, B) is evaluated to 'y' if A is less than B, or empty otherwise. This will replace $(call shell test A -lt B).

Again, the limitation is that A and B must have the same number of digits because these macros are based on $(sort ) function.

  $(call test-lt, 1, 9)    -->  y        (Works!)
  $(call test-lt, 10, 9)   -->  y        (Not work...)

To make the latter work, you need to add '0' prefix to align the number of digits:

  $(call test-lt, 10, 09)  -->  empty    (Works!)

Actually, we can live with this limitation in many places. As for the example above, we know $(CONFIG_LLD_VERSION) is 6-digits because the minimal supported version of LLVM is 11.0.0 (or CONFIG_LLD_VERSION=0 if the linker is not LLD, this case also works.)

So, the shell invocation can be replaced with more efficient code:

  ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y)

Of course, this assumption will break when LLVM 100 is released, but it will be far in the future.

---

Changes in v3:
- Ensure the given parameters are not empty

 Makefile               |  2 +-
 arch/riscv/Makefile    |  2 +-
 arch/x86/Makefile      |  2 +-
 scripts/Kbuild.include | 10 ++++++++++
 4 files changed, 13 insertions(+), 3 deletions(-)
Makefile +1 -1
index 6f846b1f2618..eb80332f7b51 100644
@@ -986,7 +986,7 @@ KBUILD_LDFLAGS += -mllvm -import-instr-limit=5
 # Check for frame size exceeding threshold during prolog/epilog insertion
 # when using lld < 13.0.0.
 ifneq ($(CONFIG_FRAME_WARN),0)
-ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)
+ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y)
 KBUILD_LDFLAGS	+= -plugin-opt=-warn-stack-size=$(CONFIG_FRAME_WARN)
 endif
 endif
arch/riscv/Makefile +1 -1
index 0d13b597cb55..faf2c2177094 100644
@@ -37,7 +37,7 @@ else
 endif
 
 ifeq ($(CONFIG_LD_IS_LLD),y)
-ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 150000; echo $$?),0)
+ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 150000),y)
 	KBUILD_CFLAGS += -mno-relax
 	KBUILD_AFLAGS += -mno-relax
 ifndef CONFIG_AS_IS_LLVM
arch/x86/Makefile +1 -1
index 415a5d138de4..e72c7a49cd59 100644
@@ -211,7 +211,7 @@ endif
 KBUILD_LDFLAGS += -m elf_$(UTS_MACHINE)
 
 ifdef CONFIG_LTO_CLANG
-ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)
+ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y)
 KBUILD_LDFLAGS	+= -plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8)
 endif
 endif
scripts/Kbuild.include +10 -0
index cbe28744637b..4b8cf464b53b 100644
@@ -11,6 +11,16 @@ space   := $(empty) $(empty)
 space_escape := _-_SPACE_-_
 pound := \#
 
+###
+# Comparison macros.
+# Usage: $(call test-le, A, B)
+# works like shell's "test A -le B", use with care bacause it is ASCII sort.
+# If A and B have the same number of digits, it works as expected.
+test-le = $(and $(strip $1),$(strip $2),$(filter $1, $(firstword $(sort $1 $2))),y)
+test-ge = $(call test-le, $2, $1)
+test-lt = $(and $(strip $1),$(strip $2),$(filter-out $2, $(firstword $(sort $1 $2))),y)
+test-gt = $(call test-lt, $2, $1)
+
 ###
 # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
 dot-target = $(dir $@).$(notdir $@)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v3 2/5 kbuild: implement {gcc,clang}-min-version only with built-in functions

Converting clang-min-version is straightforward because the versions are always 6-digit.

gcc-min-version is somewhat tricky because the minimal GCC version is GCC 5.1; prepend '0' to the version that is less than 10 so that test-ge is always passed with 6-digit versions.

---

Changes in v3:
- Add comments

Changes in v2:
- Covert gcc-min-version in a different way

 scripts/Makefile.compiler | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
scripts/Makefile.compiler +7 -2
index 20d353dcabfb..4c095beda093 100644
@@ -63,11 +63,16 @@ cc-disable-warning = $(call try-run,\
 
 # gcc-min-version
 # Usage: cflags-$(call gcc-min-version, 70100) += -foo
-gcc-min-version = $(shell [ $(CONFIG_GCC_VERSION)0 -ge $(1)0 ] && echo y)
+
+# Preprend 0 to the version that is less than 10 so test-ge works.
+# This will break when GCC 20 is released. Remove this workaround until then.
+gcc-min-version = $(call test-ge, \
+                  $(or $(filter 1%, $(CONFIG_GCC_VERSION)), 0$(CONFIG_GCC_VERSION)), \
+                  $(or $(filter 1%, $1), 0$(strip $1)))
 
 # clang-min-version
 # Usage: cflags-$(call clang-min-version, 110000) += -foo
-clang-min-version = $(shell [ $(CONFIG_CLANG_VERSION)0 -ge $(1)0 ] && echo y)
+clang-min-version = $(call test-ge, $(CONFIG_CLANG_VERSION), $1)
 
 # ld-option
 # Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y)
Signature · 1 line
2.34.1
#2 lore raw

PATCH v3 3/5 kbuild: add read-file macro

In reply to Masahiro Yamada

Since GNU Make 4.2, $(file ...) supports the read operater '<', which is useful to read a file without forking any process. No warning is shown even if the input file is missing.

For older Make versions, it falls back to the cat command.

The added ifeq will break when GNU Make 4.10 or 10.0 is released. It will take a long time if the current release pace continues.

---

(no changes since v1)

 Makefile                  |  2 +-
 scripts/Kbuild.include    | 15 +++++++++++++++
 scripts/Makefile.modfinal |  2 +-
 scripts/Makefile.modinst  |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)
Makefile +1 -1
index eb80332f7b51..60ce9dcafc72 100644
@@ -369,7 +369,7 @@ else # !mixed-build
 include $(srctree)/scripts/Kbuild.include
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
-KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
+KERNELRELEASE = $(call read-file, include/config/kernel.release)
 KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
 export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
 
scripts/Kbuild.include +15 -0
index 4b8cf464b53b..55c2243f91c8 100644
@@ -10,6 +10,10 @@ empty   :=
 space   := $(empty) $(empty)
 space_escape := _-_SPACE_-_
 pound := \#
+define newline
+
+
+endef
 
 ###
 # Comparison macros.
@@ -55,6 +59,17 @@ stringify = $(squote)$(quote)$1$(quote)$(squote)
 kbuild-dir = $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
 kbuild-file = $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile)
 
+###
+# Read a file, replacing newlines with spaces
+#
+# This ifeq will break when GNU Make 4.10 is released.
+# Remove this conditional until then.
+ifeq ($(call test-ge, $(MAKE_VERSION), 4.2),y)
+read-file = $(subst $(newline),$(space),$(file < $1))
+else
+read-file = $(shell cat $1 2>/dev/null)
+endif
+
 ###
 # Easy method for doing a status message
        kecho := :
scripts/Makefile.modfinal +1 -1
index 25bedd83644b..7252f6cf7837 100644
@@ -13,7 +13,7 @@ include $(srctree)/scripts/Kbuild.include
 include $(srctree)/scripts/Makefile.lib
 
 # find all modules listed in modules.order
-modules := $(sort $(shell cat $(MODORDER)))
+modules := $(sort $(call read-file, $(MODORDER)))
 
 __modfinal: $(modules)
 	@:
scripts/Makefile.modinst +1 -1
index a4c987c23750..509d424dbbd2 100644
@@ -9,7 +9,7 @@ __modinst:
 include include/config/auto.conf
 include $(srctree)/scripts/Kbuild.include
 
-modules := $(sort $(shell cat $(MODORDER)))
+modules := $(sort $(call read-file, $(MODORDER)))
 
 ifeq ($(KBUILD_EXTMOD),)
 dst := $(MODLIB)/kernel
Signature · 1 line
2.34.1
#3 lore raw

Re: [PATCH v3 3/5] kbuild: add read-file macro

From: Masahiro Yamada <[email protected]>
Date: Sun, 27 Nov 2022 07:56:22 +0900

Quoted 54 lines

Since GNU Make 4.2, $(file ...) supports the read operater '<', which is useful to read a file without forking any process. No warning is shown even if the input file is missing.

For older Make versions, it falls back to the cat command.

The added ifeq will break when GNU Make 4.10 or 10.0 is released. It will take a long time if the current release pace continues.

---

(no changes since v1)

 Makefile                  |  2 +-
 scripts/Kbuild.include    | 15 +++++++++++++++
 scripts/Makefile.modfinal |  2 +-
 scripts/Makefile.modinst  |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)
Makefile +1 -1
index eb80332f7b51..60ce9dcafc72 100644
@@ -369,7 +369,7 @@ else # !mixed-build
 include $(srctree)/scripts/Kbuild.include
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
-KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
+KERNELRELEASE = $(call read-file, include/config/kernel.release)
 KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
 export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
 
scripts/Kbuild.include +5 -0
index 4b8cf464b53b..55c2243f91c8 100644
@@ -10,6 +10,10 @@ empty   :=
 space   := $(empty) $(empty)
 space_escape := _-_SPACE_-_
 pound := \#
+define newline
+
+
+endef
 
 ###
 # Comparison macros.
@@ -55,6 +59,17 @@ stringify = $(squote)$(quote)$1$(quote)$(squote)
 kbuild-dir = $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
 kbuild-file = $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile)
 
+###

scripts/Kbuild.include stringify = $(squote)$(quote)$1$(quote)$(squote) · line 72

Quoted 10 lines
scripts/Kbuild.include +10 -0
+# Read a file, replacing newlines with spaces
+#
+# This ifeq will break when GNU Make 4.10 is released.
+# Remove this conditional until then.
+ifeq ($(call test-ge, $(MAKE_VERSION), 4.2),y)
+read-file = $(subst $(newline),$(space),$(file < $1))
+else
+read-file = $(shell cat $1 2>/dev/null)
+endif
+

Great stuff. Used it in my upcoming series to simplify things, works as expected.

sed-syms = $(subst $(space),\|,$(foreach file,$(sym-files-y),$(call read-file,$(file))))

The only thing that came to my mind while I was implementing the oneliner above: maybe add ability to read multiple files? For now, I used a foreach, could it be somehow incorporated into read-file already?

Besides that:

Quoted 31 lines
scripts/Kbuild.include +0 -0
 ###
 # Easy method for doing a status message
        kecho := :
scripts/Makefile.modfinal +1 -1
index 25bedd83644b..7252f6cf7837 100644
@@ -13,7 +13,7 @@ include $(srctree)/scripts/Kbuild.include
 include $(srctree)/scripts/Makefile.lib
 
 # find all modules listed in modules.order
-modules := $(sort $(shell cat $(MODORDER)))
+modules := $(sort $(call read-file, $(MODORDER)))
 
 __modfinal: $(modules)
 	@:
scripts/Makefile.modinst +1 -1
index a4c987c23750..509d424dbbd2 100644
@@ -9,7 +9,7 @@ __modinst:
 include include/config/auto.conf
 include $(srctree)/scripts/Kbuild.include
 
-modules := $(sort $(shell cat $(MODORDER)))
+modules := $(sort $(call read-file, $(MODORDER)))
 
 ifeq ($(KBUILD_EXTMOD),)
 dst := $(MODLIB)/kernel
Signature · 1 line
2.34.1

Thanks,
Olek

#4 lore raw

Re: [PATCH v3 3/5] kbuild: add read-file macro

From: Alexander Lobakin <[email protected]>
Date: Wed, 7 Dec 2022 16:40:44 +0100

Quoted 6 lines

From: Masahiro Yamada <[email protected]>
Date: Sun, 27 Nov 2022 07:56:22 +0900

Quoted 3 lines

Since GNU Make 4.2, $(file ...) supports the read operater '<', which is useful to read a file without forking any process. No warning is shown even if the input file is missing.

[...]

Quoted 9 lines

Great stuff. Used it in my upcoming series to simplify things, works as expected.

sed-syms = $(subst $(space),\|,$(foreach file,$(sym-files-y),$(call read-file,$(file))))

The only thing that came to my mind while I was implementing the oneliner above: maybe add ability to read multiple files? For now, I used a foreach, could it be somehow incorporated into read-file already?

Oh, nevermind. This one also works:

sed-syms = $(subst $(space),\|,$(call read-file,$(sym-files-y)))

So I believe read-file works for an arbitrary number of files.

Quoted 4 lines

Besides that:

[...]

Quoted 5 lines
Quoted 2 lines
Signature · 1 line
2.34.1

Thanks,
Olek

Thanks!
Olek

#5 lore raw

Re: [PATCH v3 3/5] kbuild: add read-file macro

Quoted 23 lines · Alexander Lobakin

From: Alexander Lobakin <[email protected]>
Date: Wed, 7 Dec 2022 16:40:44 +0100

Quoted 6 lines

From: Masahiro Yamada <[email protected]>
Date: Sun, 27 Nov 2022 07:56:22 +0900

Quoted 3 lines

Since GNU Make 4.2, $(file ...) supports the read operater '<', which is useful to read a file without forking any process. No warning is shown even if the input file is missing.

[...]

Quoted 9 lines

Great stuff. Used it in my upcoming series to simplify things, works as expected.

sed-syms = $(subst $(space),\|,$(foreach file,$(sym-files-y),$(call read-file,$(file))))

The only thing that came to my mind while I was implementing the oneliner above: maybe add ability to read multiple files? For now, I used a foreach, could it be somehow incorporated into read-file already?

Quoted 5 lines

Oh, nevermind. This one also works:

sed-syms = $(subst $(space),\|,$(call read-file,$(sym-files-y)))

So I believe read-file works for an arbitrary number of files.

Really?

In my understanding, $(call read-file, foo bar) reads a single file "foo bar". (a space in the file name).

Quoted 16 lines
Quoted 5 lines

Besides that:

[...]

Quoted 5 lines
Quoted 2 lines

--
2.34.1

Thanks,
Olek

Thanks!
Olek

Signature · 2 lines
Best Regards
Masahiro Yamada
#6 lore raw

Re: [PATCH v3 3/5] kbuild: add read-file macro

Quoted 33 lines · On Sat, Dec 10, 2022 at 11:10:12PM +0900 Masahiro Yamada wrote:
Quoted 23 lines · Alexander Lobakin

From: Alexander Lobakin <[email protected]>
Date: Wed, 7 Dec 2022 16:40:44 +0100

Quoted 6 lines

From: Masahiro Yamada <[email protected]>
Date: Sun, 27 Nov 2022 07:56:22 +0900

Quoted 3 lines

Since GNU Make 4.2, $(file ...) supports the read operater '<', which is useful to read a file without forking any process. No warning is shown even if the input file is missing.

[...]

Quoted 9 lines

Great stuff. Used it in my upcoming series to simplify things, works as expected.

sed-syms = $(subst $(space),\|,$(foreach file,$(sym-files-y),$(call read-file,$(file))))

The only thing that came to my mind while I was implementing the oneliner above: maybe add ability to read multiple files? For now, I used a foreach, could it be somehow incorporated into read-file already?

Quoted 5 lines

Oh, nevermind. This one also works:

sed-syms = $(subst $(space),\|,$(call read-file,$(sym-files-y)))

So I believe read-file works for an arbitrary number of files.

Quoted 5 lines

Really?

In my understanding, $(call read-file, foo bar) reads a single file "foo bar". (a space in the file name).

yes, except for make < 4.2, due to:

read-file = $(shell cat $1 2>/dev/null)

#7 lore raw

Re: [PATCH v3 3/5] kbuild: add read-file macro

From: Nicolas Schier <[email protected]>
Date: Sat, 10 Dec 2022 22:02:48 +0100

Quoted 37 lines · On Sat, Dec 10, 2022 at 11:10:12PM +0900 Masahiro Yamada wrote:
Quoted 36 lines
Quoted 23 lines · Alexander Lobakin

From: Alexander Lobakin <[email protected]>
Date: Wed, 7 Dec 2022 16:40:44 +0100

Quoted 6 lines

From: Masahiro Yamada <[email protected]>
Date: Sun, 27 Nov 2022 07:56:22 +0900

Quoted 3 lines

Since GNU Make 4.2, $(file ...) supports the read operater '<', which is useful to read a file without forking any process. No warning is shown even if the input file is missing.

[...]

Quoted 9 lines

Great stuff. Used it in my upcoming series to simplify things, works as expected.

sed-syms = $(subst $(space),\|,$(foreach file,$(sym-files-y),$(call read-file,$(file))))

The only thing that came to my mind while I was implementing the oneliner above: maybe add ability to read multiple files? For now, I used a foreach, could it be somehow incorporated into read-file already?

Quoted 5 lines

Oh, nevermind. This one also works:

sed-syms = $(subst $(space),\|,$(call read-file,$(sym-files-y)))

So I believe read-file works for an arbitrary number of files.

Really?

Quoted 6 lines
Quoted 2 lines

In my understanding, $(call read-file, foo bar) reads a single file "foo bar". (a space in the file name).

yes, except for make < 4.2, due to:

read-file = $(shell cat $1 2>/dev/null)

$ make --version
GNU Make 4.3
Built for x86_64-redhat-linux-gnu

But breh, I forgot to port test-ge, so Kbuild was always calling cat :D :clownface:
Correct, current implementation (as of v3) reads only single file. Not sure whether read-file should handle multiple at a time.

Thanks,
Olek

#8 lore raw

PATCH v3 4/5 kconfig: refactor Makefile to reduce process forks

In reply to Masahiro Yamada

Refactor Makefile and use read-file macro. For Make >= 4.2, it can read out a file by using the built-in function.

---

(no changes since v1)

 scripts/kconfig/.gitignore   |  4 +++-
 scripts/kconfig/Makefile     | 43 +++++++++++++++++++-----------------
 scripts/kconfig/gconf-cfg.sh |  7 ++++--
 scripts/kconfig/mconf-cfg.sh | 25 ++++++++++++---------
 scripts/kconfig/nconf-cfg.sh | 23 ++++++++++---------
 scripts/kconfig/qconf-cfg.sh | 10 ++++++---
 scripts/remove-stale-files   |  2 ++
 7 files changed, 67 insertions(+), 47 deletions(-)
scripts/kconfig/.gitignore +3 -1
index 500e7424b3ef..c8a3f9cd52f0 100644
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 /conf
 /[gmnq]conf
-/[gmnq]conf-cfg
+/[gmnq]conf-cflags
+/[gmnq]conf-libs
+/qconf-bin
 /qconf-moc.cc
scripts/kconfig/Makefile +23 -20

76 lines not on this page · raw message

scripts/kconfig/gconf-cfg.sh +5 -2
index cbd90c28c05f..040d8f338820 100755
@@ -1,6 +1,9 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
+cflags=$1
+libs=$2
+
 PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
 
 if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
@@ -26,5 +29,5 @@ if ! ${HOSTPKG_CONFIG} --atleast-version=2.0.0 gtk+-2.0; then
 	exit 1
 fi
 
-echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
-echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\"
+${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
+${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
scripts/kconfig/mconf-cfg.sh +14 -11
index 025b565e0b7c..1e61f50a5905 100755
@@ -1,19 +1,22 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
+cflags=$1
+libs=$2
+
 PKG="ncursesw"
 PKG2="ncurses"
 
 if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
 	if ${HOSTPKG_CONFIG} --exists $PKG; then
-		echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
-		echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\"
+		${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
+		${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
 		exit 0
 	fi
 
-	if ${HOSTPKG_CONFIG} --exists $PKG2; then
-		echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG2)\"
-		echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG2)\"
+	if ${HOSTPKG_CONFIG} --exists ${PKG2}; then
+		${HOSTPKG_CONFIG} --cflags ${PKG2} > ${cflags}
+		${HOSTPKG_CONFIG} --libs ${PKG2} > ${libs}
 		exit 0
 	fi
 fi
@@ -22,22 +25,22 @@ fi
 # (Even if it is installed, some distributions such as openSUSE cannot
 # find ncurses by pkg-config.)
 if [ -f /usr/include/ncursesw/ncurses.h ]; then
-	echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
-	echo libs=\"-lncursesw\"
+	echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags}
+	echo -lncursesw > ${libs}
 	exit 0
 fi
 
 if [ -f /usr/include/ncurses/ncurses.h ]; then
-	echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\"
-	echo libs=\"-lncurses\"
+	echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags}
+	echo -lncurses > ${libs}
 	exit 0
 fi
 
 # As a final fallback before giving up, check if $HOSTCC knows of a default
 # ncurses installation (e.g. from a vendor-specific sysroot).
 if echo '#include <ncurses.h>' | ${HOSTCC} -E - >/dev/null 2>&1; then
-	echo cflags=\"-D_GNU_SOURCE\"
-	echo libs=\"-lncurses\"
+	echo -D_GNU_SOURCE > ${cflags}
+	echo -lncurses > ${libs}
 	exit 0
 fi
 
scripts/kconfig/nconf-cfg.sh +13 -10
index 3a10bac2adb3..f871a2160e36 100755
@@ -1,19 +1,22 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
+cflags=$1
+libs=$2
+
 PKG="ncursesw menuw panelw"
 PKG2="ncurses menu panel"
 
 if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
 	if ${HOSTPKG_CONFIG} --exists $PKG; then
-		echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
-		echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\"
+		${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
+		${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
 		exit 0
 	fi
 
 	if ${HOSTPKG_CONFIG} --exists $PKG2; then
-		echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG2)\"
-		echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG2)\"
+		${HOSTPKG_CONFIG} --cflags ${PKG2} > ${cflags}
+		${HOSTPKG_CONFIG} --libs ${PKG2} > ${libs}
 		exit 0
 	fi
 fi
@@ -22,20 +25,20 @@ fi
 # (Even if it is installed, some distributions such as openSUSE cannot
 # find ncurses by pkg-config.)
 if [ -f /usr/include/ncursesw/ncurses.h ]; then
-	echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
-	echo libs=\"-lncursesw -lmenuw -lpanelw\"
+	echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags}
+	echo -lncursesw -lmenuw -lpanelw > ${libs}
 	exit 0
 fi
 
 if [ -f /usr/include/ncurses/ncurses.h ]; then
-	echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\"
-	echo libs=\"-lncurses -lmenu -lpanel\"
+	echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags}
+	echo -lncurses -lmenu -lpanel > ${libs}
 	exit 0
 fi
 
 if [ -f /usr/include/ncurses.h ]; then
-	echo cflags=\"-D_GNU_SOURCE\"
-	echo libs=\"-lncurses -lmenu -lpanel\"
+	echo -D_GNU_SOURCE > ${cflags}
+	echo -lncurses -lmenu -lpanel > ${libs}
 	exit 0
 fi
 
scripts/kconfig/qconf-cfg.sh +7 -3
index ad652cb53947..117f36e568fc 100755
@@ -1,6 +1,10 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
+cflags=$1
+libs=$2
+bin=$3
+
 PKG="Qt5Core Qt5Gui Qt5Widgets"
 
 if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
@@ -11,9 +15,9 @@ if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
 fi
 
 if ${HOSTPKG_CONFIG} --exists $PKG; then
-	echo cflags=\"-std=c++11 -fPIC $(${HOSTPKG_CONFIG} --cflags $PKG)\"
-	echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\"
-	echo moc=\"$(${HOSTPKG_CONFIG} --variable=host_bins Qt5Core)/moc\"
+	${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
+	${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
+	${HOSTPKG_CONFIG} --variable=host_bins Qt5Core > ${bin}
 	exit 0
 fi
 
scripts/remove-stale-files +2 -0
index ccadfa3afb2b..64b14aa5aebf 100755
@@ -47,3 +47,5 @@ rm -f arch/riscv/purgatory/kexec-purgatory.c
 rm -f scripts/extract-cert
 
 rm -f arch/x86/purgatory/kexec-purgatory.c
+
+rm -f scripts/kconfig/[gmnq]conf-cfg
Signature · 1 line
2.34.1
#9 lore raw

PATCH v3 5/5 kbuild: check Make version

In reply to Masahiro Yamada

This is implemented based on test-le. It will work until GNU Make 10 is released.

---

(no changes since v1)

 Makefile | 3 +++
 1 file changed, 3 insertions(+)
Makefile +3 -0
index 60ce9dcafc72..797fafbc1b45 100644
@@ -368,6 +368,9 @@ else # !mixed-build
 
 include $(srctree)/scripts/Kbuild.include
 
+# Check for the minimal Make version
+$(if $(call test-lt, $(MAKE_VERSION), 3.82), $(error Make $(MAKE_VERSION) is too old))
+
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
 KERNELRELEASE = $(call read-file, include/config/kernel.release)
 KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
Signature · 1 line
2.34.1