From 7f3a74c9cb05de59db4ad85176b84b0d71bf0eed Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 19 Aug 2022 13:24:04 -0400 Subject: [PATCH] Fix build against musl --- .../tarball/content/Directory.Build.props | 15 --------- .../tarball/content/Directory.Build.targets | 7 +++++ .../tarball/content/repos/aspnetcore.proj | 2 ++ .../tarball/content/repos/installer.proj | 4 ++- .../content/tools-local/init-build.proj | 21 +++++++++++++ .../aspnetcore/0001-fix-musl-build.patch | 31 +++++++++++++++++++ .../targets/GetRuntimeInformation.targets | 9 ++++++ 7 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-fix-musl-build.patch diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 61cc6ff6746a..52722c8c1da6 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -170,21 +170,6 @@ ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/armel - - $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) - - Windows_NT - OSX - Linux - FreeBSD - - freebsd-$(Platform) - osx-$(Platform) - linux-$(Platform) - win-$(Platform) - $(PortableRid) - - $(BuildCommandArgs) /p:EnablePackageValidation=false + + $(BuildCommandArgs) --os-name linux-musl $(ProjectDirectory)\eng\build$(ShellExtension) $(BuildCommandArgs) true diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index e34337b8599c..7d378c227e0d 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -25,7 +25,9 @@ $(BuildCommandArgs) /p:Rid=$(TargetRid) $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) - $(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform) + $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform) + $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-musl-$(Platform) + $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index 701f76c0c968..3317e29a9adf 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -20,6 +20,7 @@ + + + true + false + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) + + Windows_NT + OSX + Linux + FreeBSD + + freebsd-$(Platform) + osx-$(Platform) + linux-$(Platform) + win-$(Platform) + $(PortableRid) + + + linux + x64 + $(BuildArchitecture) + PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName)-$(Crossgen2BuildArchitecture) +-- +2.34.1 + diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 753c965d8f60..8cf02066dd2b 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -1,6 +1,13 @@ + + + + + true + false + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant) @@ -9,6 +16,8 @@ osx freebsd linux + + $(HostOSName)-musl $(HostOSName)