diff --git a/recipes-mono/mono/mono-4.xx.inc b/recipes-mono/mono/mono-4.xx.inc index 323c056c..978abcc7 100644 --- a/recipes-mono/mono/mono-4.xx.inc +++ b/recipes-mono/mono/mono-4.xx.inc @@ -9,6 +9,7 @@ DEPENDS = "zlib cmake-native" SRC_URI = "http://download.mono-project.com/sources/mono/mono-${PV}.tar.bz2 \ file://dllmap-config.in.diff \ file://0002-prevent-threadpool-exception5-test-hanging.patch \ + file://0003-include-sys-sysmacros.h-for-makedev.patch \ " # Add this patch into SRC_URI when testing projects @@ -88,7 +89,7 @@ FILES_${PN}-doc += " ${datadir}/libgc-mono/*" FILES_${PN}-dbg += " ${datadir}/mono-2.0/mono/cil/cil-opcodes.xml ${libdir}/mono/*/*.mdb ${libdir}/mono/gac/*/*/*.mdb" FILES_${PN}-staticdev += " ${libdir}/*.a" -RDEPENDS_${PN} =+ "bash" +RDEPENDS:${PN}-dev =+ "bash" # Workaround for observed race in `make install` PARALLEL_MAKEINST="" diff --git a/recipes-mono/mono/mono-4.xx/0003-include-sys-sysmacros.h-for-makedev.patch b/recipes-mono/mono/mono-4.xx/0003-include-sys-sysmacros.h-for-makedev.patch new file mode 100644 index 00000000..a451d2b9 --- /dev/null +++ b/recipes-mono/mono/mono-4.xx/0003-include-sys-sysmacros.h-for-makedev.patch @@ -0,0 +1,10 @@ +--- a/mono/io-layer/processes.c ++++ b/mono/io-layer/processes.c.new +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef HAVE_SIGNAL_H diff --git a/recipes-mono/mono/mono-base.inc b/recipes-mono/mono/mono-base.inc index e64a496f..80284456 100644 --- a/recipes-mono/mono/mono-base.inc +++ b/recipes-mono/mono/mono-base.inc @@ -31,9 +31,9 @@ do_install_append() { ${STAGING_DIR_NATIVE}${sysconfdir}/${PN} ${D}${sysconfdir} install -d ${D}${libdir}/${PN} for lib in ${MONOLIBS}; do - if [ -d "${STAGING_DIR_NATIVE}${libdir}/${PN}/$lib" ]; then + if [ -d "${STAGING_LIBDIR_NATIVE}/${PN}/$lib" ]; then cp -af --no-preserve=ownership \ - ${STAGING_DIR_NATIVE}${libdir}/${PN}/$lib ${D}${libdir}/${PN} + ${STAGING_LIBDIR_NATIVE}/${PN}/$lib ${D}${libdir}/${PN} fi done # AJL - Remove mscorlib.dll.so and mcs.exe.so files copied from mono-native to the mono destination