From 0a3abc7a8635cc1ff462b1edc172d1300aea6180 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 May 2023 17:41:09 -0400 Subject: [PATCH] user/dotnet8-build: upgrade to 8.0.100_pre4 --- user/dotnet8-build/APKBUILD | 7 +- ...t-adding-rids-with-dash-in-base-part.patch | 164 ------------------ 2 files changed, 2 insertions(+), 169 deletions(-) delete mode 100644 user/dotnet8-build/runtime_84413-support-adding-rids-with-dash-in-base-part.patch diff --git a/user/dotnet8-build/APKBUILD b/user/dotnet8-build/APKBUILD index 900ca72..cec4f96 100644 --- a/user/dotnet8-build/APKBUILD +++ b/user/dotnet8-build/APKBUILD @@ -8,13 +8,12 @@ _gittag=v8.0.100-preview.3.23178.7 _giturl="https://github.com/dotnet/dotnet" _testtag=e1cc0f181ffd4d755756d30d985513897d592ba4 _bunnytag=v12 -_stage0ver=8.0.100_pre3-r0 +_stage0ver=8.0.100_pre4-r0 _patches=" build_enable-timestamps.patch roslyn-analyzer_disable-apphost.patch runtime_79856-save-errno-when-using-posix-semaphores.patch runtime_82269-mono-thread-coop-undefine-fortify-source.patch - runtime_84413-support-adding-rids-with-dash-in-base-part.patch runtime_enable-system-libunwind.diff runtime_more-clang-16-suppression.patch runtime_remove-usage-of-off64-t.patch @@ -28,8 +27,7 @@ pkgdesc="The .NET $_pkgver_macro bootstrap" # x86: blocked by https://github.com/dotnet/runtime/issues/77667 # armhf: blocked by https://github.com/dotnet/runtime/issues/77663 # riscv64: port WIP https://github.com/dotnet/runtime/issues/36748 -# roslyn fails -#arch="all !x86 !armhf !riscv64" +arch="all !x86 !armhf !riscv64 !armv7" url=https://dotnet.microsoft.com license="MIT" # hack for dotnetx-build to be able to pull itself for bootstrapping @@ -507,7 +505,6 @@ eed7a7481a967f6938de956a6df485efa6dd61bf36ae4a768493cb1f7da0296dc91e0f2f89f7c302 4ac92d2d9190a55ee20d3e145a28a6953c98d3eb838c8acfb808b8839316443cb64da4a2c5787df0171fce7ef96ff6381043085ed90c23ec09ce9ac81571e675 roslyn-analyzer_disable-apphost.patch 77fa6d9987a7c43725582c9c493e9d4d5965a611a1d795dad4e3d46cd730caced095f994d93f91a131df7fa4b6a7277bcd3d915bae2dcd869559f22076fbc575 runtime_79856-save-errno-when-using-posix-semaphores.patch d732df247c721c9f677baabdd7f36dbf4b564814ff64164361065bb1c196b767494a1d39f634eadf01a23032c7b3e64102614b7213065c81096bbf3f8022e6a0 runtime_82269-mono-thread-coop-undefine-fortify-source.patch -2ed962096eb9d8ae61831d224ceb05b8f77f5692f38a3457048d1b4abef705e8e4f676b81bb1a833e338e75ac8dc80b0631b1a45ad9a15c5597740b7320bfbb5 runtime_84413-support-adding-rids-with-dash-in-base-part.patch 293742ab307bef459a21deadcc4ad7c7996cc4b490910a36c2763b8ad25cc8a91c4e03b6290567cd1030f69638d0156c5b6970887858fb091f8482b67356065d runtime_enable-system-libunwind.diff 887112eb2b103eadd6887529ebae7f9a75df2c2cb168e84fd40cc09f9bcd20917d428bbba06968b07b0a463890da82b1b2b1d033a3dd016e6494067464ae6f74 runtime_more-clang-16-suppression.patch 0c25319125ef5b0ad490b37a643c0c5257c796d5ed24f9ac404f698710b07de790bcbb0b6336d4a50025b94c3bff99b214951bd8f0a79a8d6f543ebaa300740f runtime_remove-usage-of-off64-t.patch diff --git a/user/dotnet8-build/runtime_84413-support-adding-rids-with-dash-in-base-part.patch b/user/dotnet8-build/runtime_84413-support-adding-rids-with-dash-in-base-part.patch deleted file mode 100644 index b9990ec..0000000 --- a/user/dotnet8-build/runtime_84413-support-adding-rids-with-dash-in-base-part.patch +++ /dev/null @@ -1,164 +0,0 @@ -From abc761c2c5694e4029fea1a60dc1934951c66e26 Mon Sep 17 00:00:00 2001 -Patch-Source: https://github.com/dotnet/runtime/pull/84413 -From: Tom Deseyn -Date: Thu, 6 Apr 2023 13:18:11 +0200 -Subject: [PATCH 1/2] Microsoft.NETCore.Platforms: support adding rids with '-' - in the base part. - -Currently when trying to add a rid like 'linux-musl-x64' -the rid is not understood to be base = 'linux-musl', arch = 'x64'. - -Instead the parser considers a potential optional qualifier. -This causes the rid to be parsed as base = 'linux', arch = 'musl', -and qualifier = 'x64'. - -We know the rids being added won't have a qualifier. If we take -this into account while parsing, we can parse the rid correctly. ---- - .../Microsoft.NETCore.Platforms/src/RID.cs | 11 +++- - .../src/RuntimeGroupCollection.cs | 2 +- - .../tests/RidTests.cs | 50 +++++++++++++------ - 3 files changed, 47 insertions(+), 16 deletions(-) - -diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RID.cs b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RID.cs -index 6457fd29cadf0..b464d5f0f54e3 100644 ---- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RID.cs -+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RID.cs -@@ -56,7 +56,7 @@ private enum RIDPart : int - Max = Qualifier - } - -- public static RID Parse(string runtimeIdentifier) -+ public static RID Parse(string runtimeIdentifier, bool noQualifier) - { - string[] parts = new string[(int)RIDPart.Max + 1]; - bool omitVersionDelimiter = true; -@@ -90,6 +90,15 @@ public static RID Parse(string runtimeIdentifier) - // version might be omitted - else if (current == ArchitectureDelimiter) - { -+ // The qualifier delimiter and architecture delimiter are the same. -+ // When there is no qualifier, there will be one delimiter past the base part -+ // for the architecture. -+ // So if we see another delimiter later in the string (for the architecture), -+ // extend the base part instead of starting the architecture part. -+ if (noQualifier && runtimeIdentifier.IndexOf(ArchitectureDelimiter, i + 1) != -1) -+ { -+ break; -+ } - // ensure there's no version later in the string - if (runtimeIdentifier.IndexOf(VersionDelimiter, i) != -1) - { -diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs -index e069508053105..31009a8d28e5e 100644 ---- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs -+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs -@@ -34,7 +34,7 @@ public RuntimeGroupCollection(ICollection runtimeGroups) - /// - public void AddRuntimeIdentifier(string runtimeIdentifier, string parent) - { -- RID rid = RID.Parse(runtimeIdentifier); -+ RID rid = RID.Parse(runtimeIdentifier, noQualifier: true); - - AddRuntimeIdentifier(rid, parent); - } -diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/tests/RidTests.cs b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/tests/RidTests.cs -index 227bcbdd10d4d..8dee0ebeda17a 100644 ---- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/tests/RidTests.cs -+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/tests/RidTests.cs -@@ -10,35 +10,57 @@ public class RidTests - { - public static IEnumerable ValidRIDData() - { -- yield return new object[] { "win10-x64", new RID() { BaseRID = "win", OmitVersionDelimiter = true, Version = new RuntimeVersion("10"), Architecture = "x64" } }; -- yield return new object[] { "win10", new RID() { BaseRID = "win", OmitVersionDelimiter = true, Version = new RuntimeVersion("10")} }; -- yield return new object[] { "linux", new RID() { BaseRID = "linux" } }; -- yield return new object[] { "linux-x64", new RID() { BaseRID = "linux", Architecture = "x64" } }; -- yield return new object[] { "linux-x64", new RID() { BaseRID = "linux", Architecture = "x64" } }; -- yield return new object[] { "debian.10-x64", new RID() { BaseRID = "debian", Version = new RuntimeVersion("10"), Architecture = "x64" } }; -- yield return new object[] { "linuxmint.19.2-x64", new RID() { BaseRID = "linuxmint", Version = new RuntimeVersion("19.2"), Architecture = "x64" } }; -- yield return new object[] { "ubuntu.14.04-x64", new RID() { BaseRID = "ubuntu", Version = new RuntimeVersion("14.04"), Architecture = "x64" } }; -- yield return new object[] { "foo-bar.42-arm", new RID() { BaseRID = "foo-bar", Version = new RuntimeVersion("42"), Architecture = "arm" } }; -- yield return new object[] { "foo-bar-arm", new RID() { BaseRID = "foo", Architecture = "bar", Qualifier = "arm" } }; // demonstrates ambiguity, avoid using `-` in base -- yield return new object[] { "linux-musl-x64", new RID() { BaseRID = "linux", Architecture = "musl", Qualifier = "x64" } }; // yes, we already have ambiguous RIDs -+ yield return new object[] { "win10-x64", new RID() { BaseRID = "win", OmitVersionDelimiter = true, Version = new RuntimeVersion("10"), Architecture = "x64" }, null }; -+ yield return new object[] { "win10", new RID() { BaseRID = "win", OmitVersionDelimiter = true, Version = new RuntimeVersion("10")}, null }; -+ yield return new object[] { "linux", new RID() { BaseRID = "linux" }, null }; -+ yield return new object[] { "linux-x64", new RID() { BaseRID = "linux", Architecture = "x64" }, null }; -+ yield return new object[] { "linux-x64", new RID() { BaseRID = "linux", Architecture = "x64" }, null }; -+ yield return new object[] { "debian.10-x64", new RID() { BaseRID = "debian", Version = new RuntimeVersion("10"), Architecture = "x64" }, null }; -+ yield return new object[] { "linuxmint.19.2-x64", new RID() { BaseRID = "linuxmint", Version = new RuntimeVersion("19.2"), Architecture = "x64" }, null }; -+ yield return new object[] { "ubuntu.14.04-x64", new RID() { BaseRID = "ubuntu", Version = new RuntimeVersion("14.04"), Architecture = "x64" }, null }; -+ yield return new object[] { "foo-bar.42-arm", new RID() { BaseRID = "foo-bar", Version = new RuntimeVersion("42"), Architecture = "arm" }, null }; -+ yield return new object[] { "foo-bar-arm", new RID() { BaseRID = "foo", Architecture = "bar", Qualifier = "arm" }, // demonstrates ambiguity, avoid using `-` in base -+ new RID() { BaseRID = "foo-bar", Architecture = "arm" } }; -+ yield return new object[] { "linux-musl-x64", new RID() { BaseRID = "linux", Architecture = "musl", Qualifier = "x64" }, // yes, we already have ambiguous RIDs -+ new RID() { BaseRID = "linux-musl", Architecture = "x64" } }; - } - - [Theory] - [MemberData(nameof(ValidRIDData))] -- internal void ParseCorrectly(string input, RID expected) -+ internal void ParseCorrectly(string input, RID expected, RID? expectedNoQualifier) - { -- RID actual = RID.Parse(input); -+ _ = expectedNoQualifier; // unused -+ -+ RID actual = RID.Parse(input, noQualifier: false); - - Assert.Equal(expected, actual); - } - - [Theory] - [MemberData(nameof(ValidRIDData))] -- internal void ToStringAsExpected(string expected, RID rid) -+ internal void ParseCorrectlyNoQualifier(string input, RID expected, RID? expectedNoQualifier) -+ { -+ expectedNoQualifier ??= expected; -+ -+ RID actual = RID.Parse(input, noQualifier: true); -+ -+ Assert.Equal(expectedNoQualifier, actual); -+ } -+ -+ [Theory] -+ [MemberData(nameof(ValidRIDData))] -+ internal void ToStringAsExpected(string expected, RID rid, RID? expectedNoQualifierRid) - { - string actual = rid.ToString(); - - Assert.Equal(expected, actual); -+ -+ if (expectedNoQualifierRid is not null) -+ { -+ actual = expectedNoQualifierRid.ToString(); -+ -+ Assert.Equal(expected, actual); -+ } - } - } - } - -From f70da467ca94291039e0ea5b0723cb9db5e090e7 Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Thu, 6 Apr 2023 18:14:31 +0200 -Subject: [PATCH 2/2] Update - src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs - -Co-authored-by: Eric StJohn ---- - .../Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs -index 31009a8d28e5e..ec4762d71424c 100644 ---- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs -+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs -@@ -34,6 +34,7 @@ public RuntimeGroupCollection(ICollection runtimeGroups) - /// - public void AddRuntimeIdentifier(string runtimeIdentifier, string parent) - { -+ // don't parse qualifier since we don't use them and they are ambiguous with `-` in base RID - RID rid = RID.Parse(runtimeIdentifier, noQualifier: true); - - AddRuntimeIdentifier(rid, parent);