mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 02:10:04 +00:00
Code Issues Projects Releases Wiki Activity

mozjs-91/mozjs-78: fix compile failure on centos7

Browse Source 
Mozjs compile failed with this failure:
/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by
/build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5)

Root Cause:
cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd
with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh
links libtinfo.so.5 under recipe-sysroot-native, which needs higher
libc. But host libc is older libc. So the incompatible problem occurred.

Solution:
rewrite cargo-host-linker in python3

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li
2021-11-19 11:56:35 +08:00
committed by Khem Raj
parent 57647ea0d6
commit b7b303fa69
4 changed files with 114 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0001-rewrite-cargo-host-linker-in-python3.patch
+56
View File
@@ -0,0 +1,56 @@
From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 18 Nov 2021 07:16:39 +0000
Subject: [PATCH] Rewrite cargo-host-linker in python3
Mozjs compile failed with this failure:
/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5)
Root Cause:
cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd
with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links
libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But
host libc is older libc. So the incompatible problem occurred.
Solution:
rewrite cargo-host-linker in python3
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
build/cargo-host-linker | 24 +++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/build/cargo-host-linker b/build/cargo-host-linker
index cbd0472bf7..ccd8bffec1 100755
--- a/build/cargo-host-linker
+++ b/build/cargo-host-linker
@@ -1,3 +1,21 @@
-#!/bin/sh
-# See comment in cargo-linker.
-eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"'
+#!/usr/bin/env python3
+
+import os,sys
+
+if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip():
+ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]
+else:
+ sys.exit(0)
+
+if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip():
+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]:
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:]
+ else:
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:]
+else:
+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]:
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:]
+ else:
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:]
+
+os.execvp(binary, args)
--
2.33.1
meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb
+1
View File
@@ -18,6 +18,7 @@ SRC_URI = " \
file://0011-replace-include-by-code-to-fix-arm-build.patch \
file://0012-Add-SharedArrayRawBufferRefs-to-public-API.patch \
file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
file://0001-rewrite-cargo-host-linker-in-python3.patch \
"
SRC_URI[sha256sum] = "a4438d84d95171a6d4fea9c9f02c2edbf0475a9c614d968ebe2eedc25a672151"
meta-oe/recipes-extended/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch
+56
View File
@@ -0,0 +1,56 @@
From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 18 Nov 2021 07:16:39 +0000
Subject: [PATCH] Rewrite cargo-host-linker in python3
Mozjs compile failed with this failure:
/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5)
Root Cause:
cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd
with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links
libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But
host libc is older libc. So the incompatible problem occurred.
Solution:
rewrite cargo-host-linker in python3
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
build/cargo-host-linker | 24 +++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/build/cargo-host-linker b/build/cargo-host-linker
index cbd0472bf7..ccd8bffec1 100755
--- a/build/cargo-host-linker
+++ b/build/cargo-host-linker
@@ -1,3 +1,21 @@
-#!/bin/sh
-# See comment in cargo-linker.
-eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"'
+#!/usr/bin/env python3
+
+import os,sys
+
+if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip():
+ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]
+else:
+ sys.exit(0)
+
+if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip():
+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]:
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:]
+ else:
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:]
+else:
+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]:
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:]
+ else:
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:]
+
+os.execvp(binary, args)
--
2.33.1
meta-oe/recipes-extended/mozjs/mozjs-91_91.2.0.bb
+1
View File
@@ -14,6 +14,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire
file://0005-nojit-32bit-arch-fix.patch \
file://0006-Fix-build-on-powerpc.patch \
file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
file://0001-rewrite-cargo-host-linker-in-python3.patch \
"
SRC_URI[sha256sum] = "3ef3cfd321d0c2c80ee1b41b8baf7a1ea4daf93c29e1377274933440ff5e42c3"