mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-17 05:05:14 +03:00
75 lines
5.1 KiB
Diff
75 lines
5.1 KiB
Diff
From 97c51fb4d0cb42d62ee60215b13df4c2d76ca68f Mon Sep 17 00:00:00 2001
|
|
From: "build@apk-groulx" <build@apk-groulx.praxis>
|
|
Date: Fri, 11 Feb 2022 16:44:05 +0000
|
|
Subject: [PATCH 1/1] musl-build
|
|
|
|
---
|
|
repos/aspnetcore.proj | 1 +
|
|
repos/core-sdk.proj | 2 +-
|
|
repos/core-setup.common.props | 2 +-
|
|
repos/corefx.common.props | 4 ++--
|
|
4 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj
|
|
index fc04c1b8..e034ec0a 100644
|
|
--- a/repos/aspnetcore.proj
|
|
+++ b/repos/aspnetcore.proj
|
|
@@ -21,6 +21,7 @@
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildRuntimeIdentifier=$(OverrideTargetRid)</BuildCommandArgs>
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:UseAppHost=false</BuildCommandArgs>
|
|
+ <BuildCommandArgs>$(BuildCommandArgs) --os-name linux-musl</BuildCommandArgs>
|
|
|
|
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
|
|
|
diff --git a/repos/core-sdk.proj b/repos/core-sdk.proj
|
|
index 7a78cf40..35cbb89d 100644
|
|
--- a/repos/core-sdk.proj
|
|
+++ b/repos/core-sdk.proj
|
|
@@ -9,7 +9,7 @@
|
|
<OSNameOverride>$(TargetRid.Substring(0, $(TargetRid.IndexOf("-"))))</OSNameOverride>
|
|
<BuildCommandArgs/>
|
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
|
|
- <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
|
|
+ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-musl-$(Platform)</BuildCommandArgs>
|
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:OSName=$(OSNameOverride)</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>
|
|
diff --git a/repos/core-setup.common.props b/repos/core-setup.common.props
|
|
index 39821269..8e2fb7a5 100644
|
|
--- a/repos/core-setup.common.props
|
|
+++ b/repos/core-setup.common.props
|
|
@@ -6,7 +6,7 @@
|
|
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
|
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
|
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-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>
|
|
<OverridePortable>$(PortableBuild)</OverridePortable>
|
|
<OverridePortable Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'FreeBSD'">true</OverridePortable>
|
|
<OverridePortable Condition="'$(BuildingPortableRuntime)' == 'true'">true</OverridePortable>
|
|
diff --git a/repos/corefx.common.props b/repos/corefx.common.props
|
|
index 8f214fbb..d7bc9800 100644
|
|
--- a/repos/corefx.common.props
|
|
+++ b/repos/corefx.common.props
|
|
@@ -12,7 +12,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>
|
|
|
|
<BuildArguments>$(FlagParameterPrefix)configuration $(Configuration)</BuildArguments>
|
|
<BuildArguments Condition="'$(RunTests)' != 'true' AND '$(PrepForTests)' != 'true'">$(BuildArguments) $(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)pack /p:SkipTests=true</BuildArguments>
|
|
@@ -24,7 +24,7 @@
|
|
<BuildArguments>$(BuildArguments) /p:PackageRid=$(OverrideTargetRid)</BuildArguments>
|
|
<!-- CoreFX parses this argument for a OS "family", i.e. rhel.7 to rhel. OSX doesn't have the extra identifier so we need to include the
|
|
"-x64" so CoreFX can find a character to break on (digits, hyphen, period). -->
|
|
- <BuildArguments Condition="'$(TargetOS)' != 'OSX'">$(BuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</BuildArguments>
|
|
+ <BuildArguments Condition="'$(TargetOS)' != 'OSX'">$(BuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))-musl</BuildArguments>
|
|
<BuildArguments Condition="'$(TargetOS)' == 'OSX'">$(BuildArguments) /p:RuntimeOS=$(OverrideTargetRid)</BuildArguments>
|
|
<BuildArguments>$(BuildArguments) /p:PortableBuild=$(OverridePortableBuild)</BuildArguments>
|
|
<BuildArguments>$(BuildArguments) /p:ILAsmToolPath=$(ToolPackageExtractDir)coreclr-tools/</BuildArguments>
|
|
--
|
|
2.34.1
|
|
|