From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 23 Feb 2021 18:44:22 +0000 (+0000)
Subject: diffoscope: Ensure the correct magic file is used
X-Git-Tag: yocto-3.3~398
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3488a8316891829892bd41a1caacaeeef73da7ef;p=openembedded-core.git

diffoscope: Ensure the correct magic file is used

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/diffoscope/diffoscope_167.bb b/meta/recipes-support/diffoscope/diffoscope_167.bb
index 9ce59a0ba0..1882d549a4 100644
--- a/meta/recipes-support/diffoscope/diffoscope_167.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_167.bb
@@ -14,4 +14,8 @@ RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magi
 # Dependencies don't build for musl
 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"