Skip to contentSkip to conversation

sysvinit: build fixed for arm64 architectures

PATCH New jpinto 2 participants 3 messages Sep 17, 2015

lore
Share & tools
lore

jpinto

author
#0 lore raw

PATCH 1/1 sysvinit: build fixed for arm64 architectures

sysvinit was not able to be built for arm64 architectures. This patch was made to fix the problem.

---
 package/sysvinit/0001-fix-libcrypt-test.patch | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/sysvinit/0001-fix-libcrypt-test.patch +9 -1
index 207270d..7233d38 100644
@@ -1,17 +1,25 @@
 Make the libcrypt test somewhat cross-compilation compliant
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
+Signed-off-by: Joao Pinto <[email protected]>
 
 Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,14 @@
  endif
  
  # Additional libs for GNU libc.
 -ifneq ($(wildcard /usr/lib*/libcrypt.a),)
++inc_additional_lib =
 +ifneq ($(wildcard $(SYSROOT)/usr/lib*/libcrypt.a),)
++  inc_additional_lib = yes
++else ifneq ($(wildcard $(SYSROOT)/usr/lib*/aarch64*/libcrypt.a),)
++  inc_additional_lib = yes
++endif
++
++ifdef inc_additional_lib
    SULOGINLIBS	+= -lcrypt
  endif
  
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/1 sysvinit: build fixed for arm64 architectures

Hi Joao,

Quoted 22 lines · jpinto

sysvinit was not able to be built for arm64 architectures. This patch was made to fix the problem.

---
 package/sysvinit/0001-fix-libcrypt-test.patch | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/sysvinit/0001-fix-libcrypt-test.patch +1 -0
index 207270d..7233d38 100644
@@ -1,17 +1,25 @@
 Make the libcrypt test somewhat cross-compilation compliant
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
+Signed-off-by: Joao Pinto <[email protected]>
 
 Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile

package/sysvinit/0001-fix-libcrypt-test.patch line 18

Quoted 10 lines
package/sysvinit/0001-fix-libcrypt-test.patch +4 -1
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,14 @@
  endif
 
  # Additional libs for GNU libc.
 -ifneq ($(wildcard /usr/lib*/libcrypt.a),)
++inc_additional_lib =
 +ifneq ($(wildcard $(SYSROOT)/usr/lib*/libcrypt.a),)
++  inc_additional_lib = yes
++else ifneq ($(wildcard $(SYSROOT)/usr/lib*/aarch64*/libcrypt.a),)

This looks to specific to that toolchain. Why not generalize

else ifneq ($(wildcard $(SYSROOT)/usr/lib*/*/libcrypt.a),)

?

baruch

Quoted 6 lines
package/sysvinit/0001-fix-libcrypt-test.patch +4 -0
++  inc_additional_lib = yes
++endif
++
++ifdef inc_additional_lib
    SULOGINLIBS	+= -lcrypt
  endif
Signature · 3 lines
     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 -
author
#2 lore raw

PATCH 1/1 sysvinit: build fixed for arm64 architectures

Hi Baruch,

Quoted 38 lines · Baruch Siach

Hi Joao,

Quoted 22 lines · jpinto

sysvinit was not able to be built for arm64 architectures. This patch was made to fix the problem.

---
 package/sysvinit/0001-fix-libcrypt-test.patch | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/sysvinit/0001-fix-libcrypt-test.patch +1 -0
index 207270d..7233d38 100644
@@ -1,17 +1,25 @@
 Make the libcrypt test somewhat cross-compilation compliant
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
+Signed-off-by: Joao Pinto <[email protected]>
 
 Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile

package/sysvinit/0001-fix-libcrypt-test.patch line 18

Quoted 10 lines
package/sysvinit/0001-fix-libcrypt-test.patch +4 -1
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,14 @@
  endif
 
  # Additional libs for GNU libc.
 -ifneq ($(wildcard /usr/lib*/libcrypt.a),)
++inc_additional_lib =
 +ifneq ($(wildcard $(SYSROOT)/usr/lib*/libcrypt.a),)
++  inc_additional_lib = yes
++else ifneq ($(wildcard $(SYSROOT)/usr/lib*/aarch64*/libcrypt.a),)

This looks to specific to that toolchain. Why not generalize

Quoted 3 lines

else ifneq ($(wildcard $(SYSROOT)/usr/lib*/*/libcrypt.a),)

?

Sounds like a good idea. Gonna send v2 patch in a sec.

Quoted 10 lines

baruch

Quoted 6 lines
package/sysvinit/0001-fix-libcrypt-test.patch +4 -0
++  inc_additional_lib = yes
++endif
++
++ifdef inc_additional_lib
    SULOGINLIBS	+= -lcrypt
  endif

Joao