diff options
Diffstat (limited to 'community/dotnet6-stage0/installer_musl-build-fix.patch')
| -rw-r--r-- | community/dotnet6-stage0/installer_musl-build-fix.patch | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/community/dotnet6-stage0/installer_musl-build-fix.patch b/community/dotnet6-stage0/installer_musl-build-fix.patch deleted file mode 100644 index 12a453c3480..00000000000 --- a/community/dotnet6-stage0/installer_musl-build-fix.patch +++ /dev/null @@ -1,113 +0,0 @@ -From a845f840a9d0f770c9851504bbf18bdc16dd58a6 Mon Sep 17 00:00:00 2001 -PatchSource: https://github.com/dotnet/installer/pull/13410 -From: Antoine Martin <dev@ayakael.net> -Date: Sun, 13 Mar 2022 23:28:21 +0000 -Subject: [PATCH 1/1] musl-build-fiox - -Musl build fix for installer - ---- - src/SourceBuild/tarball/content/Directory.Build.props | 4 ++++ - src/SourceBuild/tarball/content/Directory.Build.targets | 7 +++++++ - src/SourceBuild/tarball/content/repos/aspnetcore.proj | 2 ++ - src/SourceBuild/tarball/content/repos/installer.proj | 3 ++- - src/redist/targets/GetRuntimeInformation.targets | 9 +++++++++ - 5 files changed, 24 insertions(+), 1 deletion(-) - -diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props -index 61cc6ff67..40be008d0 100644 ---- a/src/SourceBuild/tarball/content/Directory.Build.props -+++ b/src/SourceBuild/tarball/content/Directory.Build.props -@@ -171,6 +171,9 @@ - </PropertyGroup> - - <PropertyGroup> -+ <OSPlatformIsMusl Condition="$(OSPlatformIsMuslCheck) == '0'">true</OSPlatformIsMusl> -+ <OSPlatformIsMusl Condition="$(OSPlatformIsMusl) == ''">true</OSPlatformIsMusl> -+ - <TargetRid Condition="'$(TargetRid)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid> - - <TargetOS Condition="'$(TargetOS)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS'))">Windows_NT</TargetOS> -@@ -181,6 +184,7 @@ - <PortableRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</PortableRid> - <PortableRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</PortableRid> - <PortableRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</PortableRid> -+ <PortableRid Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'true'">linux-musl-$(Platform)</PortableRid> - <PortableRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</PortableRid> - <TargetRid Condition="'$(PortableBuild)' == 'true' AND '$(PortableRid)' != ''">$(PortableRid)</TargetRid> - </PropertyGroup> -diff --git a/src/SourceBuild/tarball/content/Directory.Build.targets b/src/SourceBuild/tarball/content/Directory.Build.targets -index 02ff624bc..c7e3bd141 100644 ---- a/src/SourceBuild/tarball/content/Directory.Build.targets -+++ b/src/SourceBuild/tarball/content/Directory.Build.targets -@@ -10,6 +10,13 @@ - </ItemGroup> - </Target> - -+ <Target Name="GetOSPlatformIsMuslCheck" -+ BeforeTargets="CollectPackageReferences"> -+ <Exec IgnoreExitCode="true" Command="ldd --version 2>&1 | grep -q musl"> -+ <Output TaskParameter="ExitCode" PropertyName="OSPlatformIsMuslCheck" /> -+ </Exec> -+ </Target> -+ - <Import Condition="'$(SkipArcadeSdkImport)' != 'true'" Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" /> - - </Project> -diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj -index 480f3c713..04694770d 100644 ---- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj -+++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj -@@ -15,6 +15,8 @@ - <!-- https://github.com/dotnet/sdk/pull/20136 has not flowed into our bootstrap SDK yet, which causes file-in-use issues in ASP.NET - due to an interaction with the RemoveSharedFrameworkDependencies task. disable package validation until this is fixed. --> - <BuildCommandArgs>$(BuildCommandArgs) /p:EnablePackageValidation=false</BuildCommandArgs> -+ <!-- below is temporary fix till https://github.com/dotnet/aspnetcore/issues/39822 is addressed --> -+ <BuildCommandArgs Condition="'$(OSPlatformIsMusl)' == 'true'">$(BuildCommandArgs) --os-name linux-musl</BuildCommandArgs> - <BuildCommand>$(ProjectDirectory)\eng\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand> - - <LogVerbosityOptOut>true</LogVerbosityOptOut> -diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj -index e34337b85..587384128 100644 ---- a/src/SourceBuild/tarball/content/repos/installer.proj -+++ b/src/SourceBuild/tarball/content/repos/installer.proj -@@ -25,7 +25,8 @@ - <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs> - <BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs> - -- <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs> -+ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'false'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs> -+ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux' AND '$(OSPlatformIsMusl)' == 'true'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-musl-$(Platform)</BuildCommandArgs> - <!-- core-sdk always wants to build portable on OSX and FreeBSD --> - <BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs> - <BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs> -diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets -index 5133c3a38..01ac03776 100644 ---- a/src/redist/targets/GetRuntimeInformation.targets -+++ b/src/redist/targets/GetRuntimeInformation.targets -@@ -1,6 +1,13 @@ - <Project> - <Target Name="GetCurrentRuntimeInformation"> -+ <Exec IgnoreExitCode="true" Command="ldd --version 2>&1 | grep -q musl"> -+ <Output TaskParameter="ExitCode" PropertyName="OSPlatformIsMuslCheck" /> -+ </Exec> -+ - <PropertyGroup> -+ <OSPlatformIsMusl Condition="$(OSPlatformIsMuslCheck) == '0'">true</OSPlatformIsMusl> -+ <OSPlatformIsMusl Condition="$(OSPlatformIsMusl) == ''">false</OSPlatformIsMusl> -+ - <HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</HostRid> - <HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRid> - -@@ -9,6 +16,8 @@ - <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX')) ">osx</HostOSName> - <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD')) ">freebsd</HostOSName> - <HostOSName Condition=" '$(HostOSName)' == '' AND '$(IsLinux)' == 'True' ">linux</HostOSName> -+ <!-- If platform is musl based, adds information to HostOSName --> -+ <HostOSName Condition="$(OSPlatformIsMusl) == 'true'">$(HostOSName)-musl</HostOSName> - - <OSName Condition=" '$(OSName)' == '' ">$(HostOSName)</OSName> - --- -2.35.1 - |