Skip to contentSkip to conversation

klibc: Recognise --dyld-prefix clang option

PATCH New Khem Raj 1 participant 2 messages Apr 25, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 klibc: Recognise --dyld-prefix clang option

This is added when usrmerge is enabled in distro

---
 .../klibc/files/klcc-cross-accept-clang-options.patch        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch +4 -1
index 431c75e3af..a3a0695637 100644
@@ -5,7 +5,7 @@ Signed-off-by: Khem Raj <[email protected]>
 
 --- a/klcc/klcc.in
 +++ b/klcc/klcc.in
-@@ -207,6 +207,27 @@ while ( defined($a = shift(@ARGV)) ) {
+@@ -207,6 +207,30 @@ while ( defined($a = shift(@ARGV)) ) {
      } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) {
  	# Override gcc encoded sysroot
  	push(@ccopt, $a);
@@ -29,6 +29,9 @@ Signed-off-by: Khem Raj <[email protected]>
 +	push(@ccopt, $a);
 +    } elsif ( $a =~ '-rtlib=.*' ) {
 +	# Allow clang options
++	push(@ccopt, $a);
++    } elsif ( $a =~ '--dyld-prefix=.*' ) {
++	# Allow clang options
 +	push(@ccopt, $a);
      } else {
  	die "$0: unknown option: $a\n";
Signature · 1 line
2.36.0
author
#1 lore raw

PATCH 2/2 mozjs: Use vendored icu on ppc/clang

This helps compile gjs, external icu is needed with gcc-12 but not with clang

---
 meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb +2 -0
index af9256860c..9b990ecdf3 100644
@@ -24,6 +24,7 @@ inherit pkgconfig perlnative python3native rust
 
 DEPENDS += "zlib cargo-native python3 icu"
 DEPENDS:remove:mipsarch = "icu"
+DEPENDS:remove:powerpc:toolchain-clang = "icu"
 
 B = "${WORKDIR}/build"
 
@@ -43,6 +44,7 @@ JIT ?= ""
 JIT:mipsarch = "--disable-jit"
 ICU ?= "--with-system-icu"
 ICU:mipsarch = ""
+ICU:powerpc:toolchain-clang = ""
 
 do_configure() {
     cd ${B}
Signature · 1 line
2.36.0