Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport mono fixes to dunfell #243

Merged
merged 3 commits into from
Oct 20, 2024
Merged

Backport mono fixes to dunfell #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3c12fb
mono: fix build for glibc >= 2.40
niraami Oct 17, 2024
f4c6e27
mono: fix RDEPENDS for mono-4.xx
niraami Oct 17, 2024
bbfff4f
mono: fix native libdir path for multilib
niraami Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion recipes-mono/mono/mono-4.xx.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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=""
10 changes: 10 additions & 0 deletions recipes-mono/mono/mono-4.xx/0003-include-sys-sysmacros.h-for-makedev.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/mono/io-layer/processes.c
+++ b/mono/io-layer/processes.c.new
@@ -18,6 +18,7 @@
#include <sys/time.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <sys/stat.h>
#include <unistd.h>
#ifdef HAVE_SIGNAL_H
4 changes: 2 additions & 2 deletions recipes-mono/mono/mono-base.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading