[PATCH] Makefile: fix shell error for darwin major/minor version check

[PATCH] Makefile: fix shell error for darwin major/minor version check

[Christian Marangi]

Fix shell error:
 /bin/sh: line 0: [: too many arguments

for the darwin major/minor version check.

It seems for os_x_before for some reason DARWIN_MAJOR_VERSION and
DARWIN_MINOR_VERSION are empty. To fix this set DARWIN_MAJOR_VERSION
and DARWIN_MINOR_VERSION to be evaluated once so the value is retained.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index eb354c045c..fceac081c8 100644
--- a/Makefile
+++ b/Makefile
@@ -318,8 +318,8 @@ endif
 #
 ifeq ($(HOSTOS),darwin)
 # get major and minor product version (e.g. '10' and '6' for Snow Leopard)
-DARWIN_MAJOR_VERSION	= $(shell sw_vers -productVersion | cut -f 1 -d '.')
-DARWIN_MINOR_VERSION	= $(shell sw_vers -productVersion | cut -f 2 -d '.')
+DARWIN_MAJOR_VERSION	:= $(shell sw_vers -productVersion | cut -f 1 -d '.')
+DARWIN_MINOR_VERSION	:= $(shell sw_vers -productVersion | cut -f 2 -d '.')
 
 os_x_before	= $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \
 	$(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
-- 
2.38.1

Re: [PATCH] Makefile: fix shell error for darwin major/minor version check

[Simon Glass]

On Sat, 21 Jan 2023 at 17:42, Christian Marangi <ansuelsmth@gmail.com> wrote:
>
> Fix shell error:
>  /bin/sh: line 0: [: too many arguments
>
> for the darwin major/minor version check.
>
> It seems for os_x_before for some reason DARWIN_MAJOR_VERSION and
> DARWIN_MINOR_VERSION are empty. To fix this set DARWIN_MAJOR_VERSION
> and DARWIN_MINOR_VERSION to be evaluated once so the value is retained.
>
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> ---
>  Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH] Makefile: fix shell error for darwin major/minor version check

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

On Sun, Jan 22, 2023 at 01:42:10AM +0100, Christian Marangi wrote:

> Fix shell error:
>  /bin/sh: line 0: [: too many arguments
> 
> for the darwin major/minor version check.
> 
> It seems for os_x_before for some reason DARWIN_MAJOR_VERSION and
> DARWIN_MINOR_VERSION are empty. To fix this set DARWIN_MAJOR_VERSION
> and DARWIN_MINOR_VERSION to be evaluated once so the value is retained.
> 
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]