[PATCH 2/2] Fix for Haiku

[PATCH 2/2] Fix for Haiku

[Richard Zak]

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

Fix for path to env

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

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

+ifneq ($(BE_HOST_CPU),)
+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: 1151 bytes --]

Re: [PATCH 2/2] Fix for Haiku

[Thomas Huth]

On 03/07/2021 23.12, Richard Zak wrote:
> Fix for path to env

Please change the subject to something more meaning full, e.g. "Fix setting 
of the SHELL variable for Haiku".

In the patch description, you should mention that there is no /usr/bin/env 
on Haiku.

> Signed-off-by: Richard Zak <richard.j.zak@gmail.com 
> <mailto:richard.j.zak@gmail.com>>
> ---
>   Makefile | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 30f19d33bb..ced9b97372 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,7 +14,11 @@ SRC_PATH=.
>   # we have explicit rules for everything
>   MAKEFLAGS += -rR
> 
> +ifneq ($(BE_HOST_CPU),)
> +SHELL = /bin/env bash -o pipefail
> +else
>   SHELL = /usr/bin/env bash -o pipefail
> +endif

Actually, I wonder why we had to take the detour via /usr/bin/env here at 
all? Couldn't we simply set

SHELL = bash -o pipefail

by default, or does this cause some trouble on other systems?

If nobody objects, I'd suggest that you change your patch to always set 
"SHELL = bash -o pipefail" unconditionally.

  Thomas

Re: [PATCH 2/2] Fix for Haiku

[Philippe Mathieu-Daudé]

On 7/3/21 11:12 PM, Richard Zak wrote:
> Fix for path to env
> 
> Signed-off-by: Richard Zak <richard.j.zak@gmail.com
> <mailto:richard.j.zak@gmail.com>>
> ---
>  Makefile | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 30f19d33bb..ced9b97372 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,7 +14,11 @@ SRC_PATH=.
>  # we have explicit rules for everything
>  MAKEFLAGS += -rR
>  
> +ifneq ($(BE_HOST_CPU),)

Where is this variable defined and what is it for?

Re: [PATCH 2/2] Fix for Haiku

[Philippe Mathieu-Daudé]

On 7/4/21 12:00 PM, Philippe Mathieu-Daudé wrote:
> On 7/3/21 11:12 PM, Richard Zak wrote:
>> Fix for path to env
>>
>> Signed-off-by: Richard Zak <richard.j.zak@gmail.com
>> <mailto:richard.j.zak@gmail.com>>
>> ---
>>  Makefile | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/Makefile b/Makefile
>> index 30f19d33bb..ced9b97372 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -14,7 +14,11 @@ SRC_PATH=.
>>  # we have explicit rules for everything
>>  MAKEFLAGS += -rR
>>  
>> +ifneq ($(BE_HOST_CPU),)
> 
> Where is this variable defined and what is it for?

IIUC it is defined by BeOS, and Haiku is based on it,
so also defines it. Is that correct?

Re: [PATCH 2/2] Fix for Haiku

[Richard Zak]

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

I'll re-submit with better comments, and this variable is defined on Haiku,
presumably for support for old Be OS applications, to indicate the
architecture of the CPU. On my 64-bit system, it's value is "x86_64",
32-bit it's "x86".

În dum., 4 iul. 2021 la 09:51, Philippe Mathieu-Daudé <f4bug@amsat.org> a
scris:

> On 7/4/21 12:00 PM, Philippe Mathieu-Daudé wrote:
> > On 7/3/21 11:12 PM, Richard Zak wrote:
> >> Fix for path to env
> >>
> >> Signed-off-by: Richard Zak <richard.j.zak@gmail.com
> >> <mailto:richard.j.zak@gmail.com>>
> >> ---
> >>  Makefile | 4 ++++
> >>  1 file changed, 4 insertions(+)
> >>
> >> diff --git a/Makefile b/Makefile
> >> index 30f19d33bb..ced9b97372 100644
> >> --- a/Makefile
> >> +++ b/Makefile
> >> @@ -14,7 +14,11 @@ SRC_PATH=.
> >>  # we have explicit rules for everything
> >>  MAKEFLAGS += -rR
> >>
> >> +ifneq ($(BE_HOST_CPU),)
> >
> > Where is this variable defined and what is it for?
>
> IIUC it is defined by BeOS, and Haiku is based on it,
> so also defines it. Is that correct?
>


-- 
Regards,

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

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