mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

diffoscope: Ensure the correct magic file is used

Browse Source 
diffoscope uses libmagic and it was searching in file-native's sysroot
for the magic file. Wrap it and set MAGIC in the environment to
ensure the file is found correctly and avoid build failures.

(From OE-Core rev: 3488a8316891829892bd41a1caacaeeef73da7ef)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-02-23 18:44:22 +00:00
parent 8b299a62c5
commit 116743ecc2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/diffoscope/diffoscope_167.bb
+4
View File
@@ -14,4 +14,8 @@ RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magi
# Dependencies don't build for musl # Dependencies don't build for musl
COMPATIBLE_HOST_libc-musl = 'null' COMPATIBLE_HOST_libc-musl = 'null'
do_install_append_class-native() {
create_wrapper ${D}${bindir}/diffoscope MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc
}
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"