forked from brl/citadel
Bruce Leidl
3db0a6b032
poky: Upgrade to Yocto 4.1 Langdale meta-citadel/recipes-kernel: citadel-kernel 5.19.9 -> 6.0.8 meta-citadel/recipes-sway: sway 1.5.1 -> 1.7 (meta-wayland) wlroots 0.12.0 -> 0.15.1 (meta-wayland) meta-gnome/recipes-connectivity: iwd 1.27 -> 1.30 (meta-oe) modemmanager 1.18.2 -> 1.18.6 (meta-oe) networkmanager 1.36.2 -> 1.40.0 (meta-oe) meta-gnome/recipes-freedesktop: libgusb 0.3.7 -> 0.3.10 (meta-oe) meta-gnome/recipes-gnome: adwaita-icon-theme 42 -> 43 (oe-core) geocode-glib 3.26.2 -> 3.26.4 (meta-oe) gjs 1.72.0 -> 1.73.2 (meta-oe) gnome-bluetooth 42.0 -> 42.4 (meta-oe) gnome-control-center 42.1 -> 43.0 gnome-desktop 42.1 -> 43.rc gnome-settings-daemon 42.1 -> 43.0 gnome-shell 42.1 -> 43.0 gsettings-desktop-schema 41.0 -> 43.0 gtk4 4.6.4 -> 4.6.7 (meta-oe) gvfs 1.50.0 -> 1.50.2 (meta-oe) libadwaita 1.1.1 -> 1.2.0 (meta-oe) libgee 0.20.4 -> 0.20.6 (meta-oe) mutter 42.1 -> 43.0 rest 0.8.1 -> 0.9.0 (meta-oe) meta-gnome/recipes-support: ell 0.50 -> 0.53 (poky) exiv2 0.26 -> 0.27.3 (meta-oe) graphene 1.10.2 -> 1.10.8 (meta-oe) gsound 1.0.2 -> 1.0.3 (meta-oe) icu_71.1 (removed from meta-gnome because this version is in poky) jansson 2.12 -> 2.14 (meta-oe) lcms 2.9 -> 2.14 (meta-oe) libdvdread 6.1.1 -> 6.1.3 (meta-oe) libndp 1.6 -> 1.8 (meta-oe) mozjs 91.8.0 -> 102.3.0 power-profiles-daemon 0.12 (new-recipe)
55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
From ceb1a6e510b51196005f3df32f12d67a3357a0a1 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..87d43ce9ec 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)
|