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

Mono: fix DSM 7 compatibility #5604

Merged
merged 2 commits into from
Feb 20, 2023
Merged

Mono: fix DSM 7 compatibility #5604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7841e4
DSM 7 compatibility
mreid-tt Feb 12, 2023
c6f815a
Exclude aarch64 on DSM 6.x (issue #3666)
mreid-tt Feb 19, 2023
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
2 changes: 2 additions & 0 deletions cross/mono/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ LICENSE = https://www.mono-project.com/docs/faq/licensing
# Although qoriq can be compiled successfully it won't run as classic floating point unit not available
# For details see: https://github.com/SynoCommunity/spksrc/issues/3470#issuecomment-469391052
UNSUPPORTED_ARCHS = $(PPC_ARCHS)
# Mono versions newer than 5.8.0 have an incompatibility with aarch64 on DSM 6.x (issue #3666)
UNSUPPORTED_ARCHS_TCVERSION = aarch64-6.1

PRE_CONFIGURE_TARGET = mono_pre_configure
GNU_CONFIGURE = 1
Expand Down
8 changes: 4 additions & 4 deletions native/mono/patches/001-relocate-specialfolders.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
return ReadXdgUserDir (config, home, "XDG_VIDEOS_DIR", "Videos");
case SpecialFolder.CommonTemplates:
- return "/usr/share/templates";
+ return "/var/packages/mono/target/var/templates";
+ return "/var/packages/mono/var/templates";
case SpecialFolder.Fonts:
if (Platform == PlatformID.MacOSX)
return Path.Combine (home, "Library", "Fonts");
Expand All @@ -14,7 +14,7 @@
// This is where data common to all users goes
case SpecialFolder.CommonApplicationData:
- return "/usr/share";
+ return "/var/packages/mono/target/var";
+ return "/var/packages/mono/var";
default:
throw new ArgumentException ("Invalid SpecialFolder");
}
Expand All @@ -26,8 +26,8 @@
{
- case SpecialFolder.CommonApplicationData: return "/usr/share";
- case SpecialFolder.CommonTemplates: return "/usr/share/templates";
+ case SpecialFolder.CommonApplicationData: return "/var/packages/mono/target/var";
+ case SpecialFolder.CommonTemplates: return "/var/packages/mono/target/var/templates";
+ case SpecialFolder.CommonApplicationData: return "/var/packages/mono/var";
+ case SpecialFolder.CommonTemplates: return "/var/packages/mono/var/templates";
}
if (IsMac)
{
8 changes: 4 additions & 4 deletions native/mono_58/patches/001-relocate-specialfolders.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
return ReadXdgUserDir (config, home, "XDG_VIDEOS_DIR", "Videos");
case SpecialFolder.CommonTemplates:
- return "/usr/share/templates";
+ return "/var/packages/mono/target/var/templates";
+ return "/var/packages/mono/var/templates";
case SpecialFolder.Fonts:
if (Platform == PlatformID.MacOSX)
return Path.Combine (home, "Library", "Fonts");
Expand All @@ -14,7 +14,7 @@
// This is where data common to all users goes
case SpecialFolder.CommonApplicationData:
- return "/usr/share";
+ return "/var/packages/mono/target/var";
+ return "/var/packages/mono/var";
default:
throw new ArgumentException ("Invalid SpecialFolder");
}
Expand All @@ -26,8 +26,8 @@
{
- case SpecialFolder.CommonApplicationData: return "/usr/share";
- case SpecialFolder.CommonTemplates: return "/usr/share/templates";
+ case SpecialFolder.CommonApplicationData: return "/var/packages/mono/target/var";
+ case SpecialFolder.CommonTemplates: return "/var/packages/mono/target/var/templates";
+ case SpecialFolder.CommonApplicationData: return "/var/packages/mono/var";
+ case SpecialFolder.CommonTemplates: return "/var/packages/mono/var/templates";
}
if (IsMac)
{
6 changes: 4 additions & 2 deletions spk/mono/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SPK_NAME = mono
SPK_VERS = 5.20.1.34
SPK_REV = 18
SPK_REV = 19
SPK_ICON = src/mono.png

DEPENDS = cross/$(SPK_NAME)
Expand All @@ -10,12 +10,14 @@ REQUIRED_MIN_DSM = 5.0
# Although qoriq can be compiled successfully it won't run as classic floating point unit not available
# For details see: https://github.com/SynoCommunity/spksrc/issues/3470#issuecomment-469391052
UNSUPPORTED_ARCHS = $(PPC_ARCHS)
# Mono versions newer than 5.8.0 have an incompatibility with aarch64 on DSM 6.x (issue #3666)
UNSUPPORTED_ARCHS_TCVERSION = aarch64-6.1

MAINTAINER = hgy59
DESCRIPTION = Cross platform, open source .NET development framework.
DISPLAY_NAME = Mono
STARTABLE = no
CHANGELOG = "1. Update to version 5.20.1.34<br/>2. Fix workaround for ARMv5 (88f628x archs)<br/>3. Remove static libraries."
CHANGELOG = "Fix DSM 7 compatibility."

HOMEPAGE = https://mono-project.com
LICENSE = https://www.mono-project.com/docs/faq/licensing
Expand Down