mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-23 11:15:13 +03:00
75 lines
4.6 KiB
Diff
75 lines
4.6 KiB
Diff
From 345cf51b619d2b89b399a7e39b538baf5d1f2307 Mon Sep 17 00:00:00 2001
|
|
From: "build@apk-groulx" <build@apk-groulx.praxis>
|
|
Date: Tue, 22 Feb 2022 18:38:01 +0000
|
|
Subject: [PATCH 1/1] musl-build
|
|
|
|
---
|
|
Directory.Build.props | 2 +-
|
|
repos/aspnetcore.proj | 1 +
|
|
repos/installer.proj | 2 +-
|
|
repos/runtime.common.props | 4 ++--
|
|
4 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Directory.Build.props b/Directory.Build.props
|
|
index d1b268bf..e2c5d5d3 100644
|
|
--- a/Directory.Build.props
|
|
+++ b/Directory.Build.props
|
|
@@ -202,7 +202,7 @@
|
|
<PropertyGroup Condition="'$(PortableBuild)' == 'true'">
|
|
<TargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</TargetRid>
|
|
<TargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</TargetRid>
|
|
- <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</TargetRid>
|
|
+ <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-musl-$(Platform)</TargetRid>
|
|
<TargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</TargetRid>
|
|
</PropertyGroup>
|
|
|
|
diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj
|
|
index 23cac6d1..3d6f648c 100644
|
|
--- a/repos/aspnetcore.proj
|
|
+++ b/repos/aspnetcore.proj
|
|
@@ -22,6 +22,7 @@
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:UseAppHost=false</BuildCommandArgs>
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
|
|
+ <BuildCommandArgs>$(BuildCommandArgs) --os-name linux-musl</BuildCommandArgs>
|
|
|
|
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
|
|
included by Arcade -->
|
|
diff --git a/repos/installer.proj b/repos/installer.proj
|
|
index fd8a95be..1e55548a 100644
|
|
--- a/repos/installer.proj
|
|
+++ b/repos/installer.proj
|
|
@@ -27,7 +27,7 @@
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
|
|
|
|
|
|
- <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
|
|
+ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=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/repos/runtime.common.props b/repos/runtime.common.props
|
|
index 97ceb231..87126cbd 100644
|
|
--- a/repos/runtime.common.props
|
|
+++ b/repos/runtime.common.props
|
|
@@ -15,7 +15,7 @@
|
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
|
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
|
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
|
|
- <OverrideTargetRid Condition="'$(TargetOS)' == 'Linux' and ('$(PortableBuild)' == 'true' or '$(BuildingPortableRuntime)' == 'true')">linux-$(Platform)</OverrideTargetRid>
|
|
+ <OverrideTargetRid Condition="'$(TargetOS)' == 'Linux' and ('$(PortableBuild)' == 'true' or '$(BuildingPortableRuntime)' == 'true')">linux-musl-$(Platform)</OverrideTargetRid>
|
|
|
|
<UseSystemLibunwind Condition="'$(UseSystemLibunwind)' == '' AND '$(OS)' == 'Windows_NT'">false</UseSystemLibunwind>
|
|
<UseSystemLibunwind Condition="'$(UseSystemLibunwind)' == '' AND '$(TargetOS)' == 'OSX'">false</UseSystemLibunwind>
|
|
@@ -43,7 +43,7 @@
|
|
<!-- PGO is disabled for now because the profiler only runs on Windows: https://github.com/dotnet/source-build/issues/247 -->
|
|
<CoreClrBuildArguments>$(CoreClrBuildArguments) /p:NoPgoOptimize=true</CoreClrBuildArguments>
|
|
<CoreClrBuildArguments>$(CoreClrBuildArguments) /p:KeepNativeSymbols=true</CoreClrBuildArguments>
|
|
- <CoreClrBuildArguments Condition="'$(TargetOS)' != 'OSX'">$(CoreClrBuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</CoreClrBuildArguments>
|
|
+ <CoreClrBuildArguments Condition="'$(TargetOS)' != 'OSX'">$(CoreClrBuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))-musl</CoreClrBuildArguments>
|
|
<CoreClrBuildArguments Condition="'$(TargetOS)' == 'OSX'">$(CoreClrBuildArguments) /p:RuntimeOS=$(OverrideTargetRid)</CoreClrBuildArguments>
|
|
|
|
<!-- libraries -->
|
|
--
|
|
2.34.1
|
|
|