aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltán Böszörményi <zboszor@pr.hu>2018-01-19 10:48:57 +0100
committerAlex J Lennon <ajlennon@dynamicdevices.co.uk>2018-01-24 09:45:15 +0000
commit23654d99ed69f8ab46665fb6d8b33064b62c4f76 (patch)
tree8748e9075800e2fe5c8eb6106983a06c664fb5b2
parentbf779854a98afdb5516fb4f7598e711515d9103f (diff)
downloadmeta-mono-23654d99ed69f8ab46665fb6d8b33064b62c4f76.tar.gz
meta-mono-23654d99ed69f8ab46665fb6d8b33064b62c4f76.tar.bz2
meta-mono-23654d99ed69f8ab46665fb6d8b33064b62c4f76.zip
Fix per-recipe sysroots in Yocto 2.3+
Yocto 2.3 (Pyro) added per-recipe sysroots. Previously a common sysroot was used for every package installed. See: https://www.yoctoproject.org/docs/2.3/ref-manual/ref-manual.html#moving-to-the-yocto-project-2.3-release By default, ${libdir}/mono is not included in recipe-sysroot-native for dependant packages which prevents running the native mono binary that looks for DLLs relative to itself. This patch should be backported to Pyro and Rocko from master. Signed-off-by: Zoltán Böszörményi <zboszor@pr.hu>
-rw-r--r--recipes-mono/mono/mono-native-5.xx-base.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/recipes-mono/mono/mono-native-5.xx-base.inc b/recipes-mono/mono/mono-native-5.xx-base.inc
index 5379bc7..50460f1 100644
--- a/recipes-mono/mono/mono-native-5.xx-base.inc
+++ b/recipes-mono/mono/mono-native-5.xx-base.inc
@@ -9,3 +9,10 @@ do_compile() {
EDEPENDS_X11 =+ "libgdiplus-native"
PACKAGECONFIG[x11] = ",,${EDEPENDS_X11}"
+
+mono_copy_libdir_mono() {
+ install -d -m0755 ${STAGING_LIBDIR_NATIVE}
+ cp -arf ${SYSROOT_DESTDIR}${STAGING_LIBDIR_NATIVE}/mono ${STAGING_LIBDIR_NATIVE}/
+}
+
+do_populate_sysroot[postfuncs] += " mono_copy_libdir_mono "