[PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku

[PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku

[Richard Zak]

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

Signed-off-by: Richard Zak <richard.j.zak@gmail.com>
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 30f19d33bb..37124410da 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,13 @@ SRC_PATH=.
 # we have explicit rules for everything
 MAKEFLAGS += -rR

-SHELL = /usr/bin/env bash -o pipefail
+# Detect Haiku by checking BeOS variable for host CPU type
+ifneq ($(BE_HOST_CPU),)
+  # Haiku doesn't have the /usr directory
+  SHELL = /bin/env bash -o pipefail
+else
+  SHELL = /usr/bin/env bash -o pipefail
+endif

 # Usage: $(call quiet-command,command and args,"NAME","args to print")
 # This will run "command and args", and either:
-- 
2.25.1


-- 
Regards,

Richard J. Zak
Professional Genius
PGP Key: https://keybase.io/rjzak/key.asc

[-- Attachment #2: Type: text/html, Size: 1278 bytes --]

Re: [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku

[Thomas Huth]

On 04/07/2021 16.28, Richard Zak wrote:
> Signed-off-by: Richard Zak <richard.j.zak@gmail.com 
> <mailto:richard.j.zak@gmail.com>>
> ---
>   Makefile | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 30f19d33bb..37124410da 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,7 +14,13 @@ SRC_PATH=.
>   # we have explicit rules for everything
>   MAKEFLAGS += -rR
> 
> -SHELL = /usr/bin/env bash -o pipefail
> +# Detect Haiku by checking BeOS variable for host CPU type
> +ifneq ($(BE_HOST_CPU),)
> +  # Haiku doesn't have the /usr directory
> +  SHELL = /bin/env bash -o pipefail
> +else
> +  SHELL = /usr/bin/env bash -o pipefail
> +endif

Why not simply:

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ SRC_PATH=.
  # we have explicit rules for everything
  MAKEFLAGS += -rR

-SHELL = /usr/bin/env bash -o pipefail
+SHELL = bash -o pipefail

  # Usage: $(call quiet-command,command and args,"NAME","args to print")
  # This will run "command and args", and either:

?

  Thomas

Re: [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku

[Richard Zak]

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

Yes, that would have been fine, but I don't know why that wasn't done
previously. Someone else had put in the full path to env for bash, so I
didn't want to change something which may have been intentional.

În dum., 4 iul. 2021 la 12:19, Thomas Huth <thuth@redhat.com> a scris:

> On 04/07/2021 16.28, Richard Zak wrote:
> > Signed-off-by: Richard Zak <richard.j.zak@gmail.com
> > <mailto:richard.j.zak@gmail.com>>
> > ---
> >   Makefile | 8 +++++++-
> >   1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 30f19d33bb..37124410da 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -14,7 +14,13 @@ SRC_PATH=.
> >   # we have explicit rules for everything
> >   MAKEFLAGS += -rR
> >
> > -SHELL = /usr/bin/env bash -o pipefail
> > +# Detect Haiku by checking BeOS variable for host CPU type
> > +ifneq ($(BE_HOST_CPU),)
> > +  # Haiku doesn't have the /usr directory
> > +  SHELL = /bin/env bash -o pipefail
> > +else
> > +  SHELL = /usr/bin/env bash -o pipefail
> > +endif
>
> Why not simply:
>
> diff --git a/Makefile b/Makefile
> --- a/Makefile
> +++ b/Makefile
> @@ -14,7 +14,7 @@ SRC_PATH=.
>   # we have explicit rules for everything
>   MAKEFLAGS += -rR
>
> -SHELL = /usr/bin/env bash -o pipefail
> +SHELL = bash -o pipefail
>
>   # Usage: $(call quiet-command,command and args,"NAME","args to print")
>   # This will run "command and args", and either:
>
> ?
>
>   Thomas
>
>

-- 
Regards,

Richard J. Zak
Professional Genius
PGP Key: https://keybase.io/rjzak/key.asc

[-- Attachment #2: Type: text/html, Size: 2448 bytes --]