[Buildroot] [PATCH v2] sysvinit: arm64 build fix

[Buildroot] [PATCH v2] sysvinit: arm64 build fix

[Joao Pinto]

sysvinit was not able to be built for arm64 architectures.
The package patch was changed according to the suggestion of 
Thomas Petazzoni.

Signed-off-by: Joao Pinto <jpinto@synopsys.com>
---
 package/sysvinit/0001-fix-libcrypt-test.patch | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/sysvinit/0001-fix-libcrypt-test.patch b/package/sysvinit/0001-fix-libcrypt-test.patch
index 207270d..3724110 100644
--- a/package/sysvinit/0001-fix-libcrypt-test.patch
+++ b/package/sysvinit/0001-fix-libcrypt-test.patch
@@ -1,17 +1,20 @@
 Make the libcrypt test somewhat cross-compilation compliant
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
 Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -78,7 +78,7 @@
+@@ -78,8 +78,9 @@ else
  endif
  
  # Additional libs for GNU libc.
 -ifneq ($(wildcard /usr/lib*/libcrypt.a),)
-+ifneq ($(wildcard $(SYSROOT)/usr/lib*/libcrypt.a),)
-   SULOGINLIBS	+= -lcrypt
+-  SULOGINLIBS	+= -lcrypt
++HAS_LIBCRYPT=$(shell f=`mktemp` && echo 'int main(void) {}' | $(CC) -o $$f -xc - -lcrypt >/dev/null 2>&1 && echo yes; rm -f $$f)
++ifeq ($(HAS_LIBCRYPT),yes)
++  SULOGINLIBS += -lcrypt
  endif
  
+ all:		$(BIN) $(SBIN) $(USRBIN)
-- 
1.8.1.5

[Buildroot] [PATCH] sysvinit: arm64 build fix

[Baruch Siach]

Hi Joao,

[Resend with the correct list address]

On Mon, Sep 21, 2015 at 05:10:15PM +0100, Joao Pinto wrote:
> sysvinit was not able to be built for arm64 architectures.
> The package patch was changed according to the suggestion of 
> Thomas Petazzoni.
> 
> Signed-off-by: Joao Pinto <jpinto@synopsys.com>
> ---
>  package/sysvinit/0001-fix-libcrypt-test.patch | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/package/sysvinit/0001-fix-libcrypt-test.patch b/package/sysvinit/0001-fix-libcrypt-test.patch
> index 207270d..3724110 100644
> --- a/package/sysvinit/0001-fix-libcrypt-test.patch
> +++ b/package/sysvinit/0001-fix-libcrypt-test.patch
> @@ -1,17 +1,21 @@
>  Make the libcrypt test somewhat cross-compilation compliant
>  
>  Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> +Signed-off-by: Joao Pinto <jpinto@synopsys.com>
>  
>  Index: b/src/Makefile
>  ===================================================================
>  --- a/src/Makefile
>  +++ b/src/Makefile
> -@@ -78,7 +78,7 @@
> +@@ -78,8 +78,9 @@ else
>   endif
>   
>   # Additional libs for GNU libc.
>  -ifneq ($(wildcard /usr/lib*/libcrypt.a),)
> -+ifneq ($(wildcard $(SYSROOT)/usr/lib*/libcrypt.a),)
> -   SULOGINLIBS	+= -lcrypt
> +-  SULOGINLIBS	+= -lcrypt
> ++HAS_LIBCRYPT=$(shell f=`mktemp` && echo 'int main(void) {}' | $(CC) -o $$f -xc - -lcrypt >/dev/null 2>&1 && echo yes && rm -f $$f)

The last '&&' causes the 'rm' command to delete the temporary file only when 
the test succeeds. Should be ';' instead, I think.

baruch

> ++ifeq ($(HAS_LIBCRYPT),yes)
> ++  SULOGINLIBS += -lcrypt
>   endif
>   
> + all:		$(BIN) $(SBIN) $(USRBIN)

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH] sysvinit: arm64 build fix

[Joao Pinto]

Hi Baruch!

On 9/21/2015 5:32 PM, Baruch Siach wrote:
> Hi Joao,
> 
> [Resend with the correct list address]
> 
> On Mon, Sep 21, 2015 at 05:10:15PM +0100, Joao Pinto wrote:
>> sysvinit was not able to be built for arm64 architectures.
>> The package patch was changed according to the suggestion of 
>> Thomas Petazzoni.
>>
>> Signed-off-by: Joao Pinto <jpinto@synopsys.com>
>> ---
>>  package/sysvinit/0001-fix-libcrypt-test.patch | 10 +++++++---
>>  1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/package/sysvinit/0001-fix-libcrypt-test.patch b/package/sysvinit/0001-fix-libcrypt-test.patch
>> index 207270d..3724110 100644
>> --- a/package/sysvinit/0001-fix-libcrypt-test.patch
>> +++ b/package/sysvinit/0001-fix-libcrypt-test.patch
>> @@ -1,17 +1,21 @@
>>  Make the libcrypt test somewhat cross-compilation compliant
>>  
>>  Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> +Signed-off-by: Joao Pinto <jpinto@synopsys.com>
>>  
>>  Index: b/src/Makefile
>>  ===================================================================
>>  --- a/src/Makefile
>>  +++ b/src/Makefile
>> -@@ -78,7 +78,7 @@
>> +@@ -78,8 +78,9 @@ else
>>   endif
>>   
>>   # Additional libs for GNU libc.
>>  -ifneq ($(wildcard /usr/lib*/libcrypt.a),)
>> -+ifneq ($(wildcard $(SYSROOT)/usr/lib*/libcrypt.a),)
>> -   SULOGINLIBS	+= -lcrypt
>> +-  SULOGINLIBS	+= -lcrypt
>> ++HAS_LIBCRYPT=$(shell f=`mktemp` && echo 'int main(void) {}' | $(CC) -o $$f -xc - -lcrypt >/dev/null 2>&1 && echo yes && rm -f $$f)
> 
> The last '&&' causes the 'rm' command to delete the temporary file only when 
> the test succeeds. Should be ';' instead, I think.

Well spoted! Gonna change and resubmit.

> 
> baruch
> 
>> ++ifeq ($(HAS_LIBCRYPT),yes)
>> ++  SULOGINLIBS += -lcrypt
>>   endif
>>   
>> + all:		$(BIN) $(SBIN) $(USRBIN)
> 

Thanks,
Joao

[Buildroot] [PATCH v2] sysvinit: arm64 build fix

[Thomas Petazzoni]

Dear Joao Pinto,

On Wed, 16 Dec 2015 15:21:38 +0000, Joao Pinto wrote:
> sysvinit was not able to be built for arm64 architectures.
> The package patch was changed according to the suggestion of 
> Thomas Petazzoni.
> 
> Signed-off-by: Joao Pinto <jpinto@synopsys.com>
> ---
>  package/sysvinit/0001-fix-libcrypt-test.patch | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com