mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 19:43:41 +00:00
uutils-coreutils: disable stdbuf compilation
There is a bug in uutils-coreutils causing stdbuf to include the HOST version of libstdbuf.so, even when cross-compiled. As a side-effect, the uutils-coreutils binary was containing the buildpath, because RPATH was set on libstdbuf.so. Thus the buildpath error can be re-enabled. This is tracked upstream by https://github.com/uutils/coreutils/issues/6591 Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> Co-authored-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
8aa895e877
commit
1d43511321
@ -0,0 +1,39 @@
|
|||||||
|
From 5c08d92aae49f83e3b52ae58e566ef48c749f3c7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Etienne Cordonnier <ecordonnier@snap.com>
|
||||||
|
Date: Fri, 7 Mar 2025 16:39:33 +0100
|
||||||
|
Subject: [PATCH] do not compile stdbuf
|
||||||
|
|
||||||
|
Due to including the host version of libstdbuf.so, stdbuf does not work when cross-compiled. See https://github.com/uutils/coreutils/issues/6591#issuecomment-2706575853 for details
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [OE-Specific]
|
||||||
|
|
||||||
|
Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
|
||||||
|
---
|
||||||
|
Cargo.toml | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Cargo.toml b/Cargo.toml
|
||||||
|
index ea87ccea79..e218719363 100644
|
||||||
|
--- a/Cargo.toml
|
||||||
|
+++ b/Cargo.toml
|
||||||
|
@@ -154,7 +154,7 @@ feat_os_macos = [
|
||||||
|
feat_os_unix = [
|
||||||
|
"feat_Tier1",
|
||||||
|
#
|
||||||
|
- "feat_require_crate_cpp",
|
||||||
|
+ # don't compile feature_require_crate_cpp per default (which contains only stdbuf). "feat_require_crate_cpp",
|
||||||
|
"feat_require_unix",
|
||||||
|
"feat_require_unix_utmpx",
|
||||||
|
"feat_require_unix_hostid",
|
||||||
|
@@ -189,7 +189,7 @@ feat_os_unix_android = [
|
||||||
|
# ** NOTE: these `feat_require_...` sets should be minimized as much as possible to encourage cross-platform availability of utilities
|
||||||
|
#
|
||||||
|
# "feat_require_crate_cpp" == set of utilities requiring the `cpp` crate (which fail to compile on several platforms; as of 2020-04-23)
|
||||||
|
-feat_require_crate_cpp = ["stdbuf"]
|
||||||
|
+feat_require_crate_cpp = []
|
||||||
|
# "feat_require_unix" == set of utilities requiring support which is only available on unix platforms (as of 2020-04-23)
|
||||||
|
feat_require_unix = [
|
||||||
|
"chgrp",
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e74349878141b240070458d414ab3b64"
|
|||||||
|
|
||||||
inherit cargo cargo-update-recipe-crates
|
inherit cargo cargo-update-recipe-crates
|
||||||
|
|
||||||
SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main"
|
SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main \
|
||||||
|
file://0001-do-not-compile-stdbuf.patch"
|
||||||
|
|
||||||
# musl not supported because the libc crate does not support functions like "endutxent" at the moment,
|
# musl not supported because the libc crate does not support functions like "endutxent" at the moment,
|
||||||
# so src/uucore/src/lib/features.rs disables utmpx when targetting musl.
|
# so src/uucore/src/lib/features.rs disables utmpx when targetting musl.
|
||||||
@ -67,6 +68,3 @@ python __anonymous() {
|
|||||||
for prog in d.getVar('sbindir_progs').split():
|
for prog in d.getVar('sbindir_progs').split():
|
||||||
d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog))
|
d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog))
|
||||||
}
|
}
|
||||||
|
|
||||||
ERROR_QA:remove = "buildpaths"
|
|
||||||
WARN_QA:append = " buildpaths"
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user