-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
152 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| FROM ubuntu:20.04 | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y gpg curl wget software-properties-common && \ | ||
| wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ | ||
| apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \ | ||
| apt-get update && \ | ||
| apt-get install -y cmake llvm-9 clang-9 autoconf automake libtool build-essential python curl git lldb-6.0 liblldb-6.0-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libssl-dev libnuma-dev libkrb5-dev zlib1g-dev debootstrap qemu-user-static locales && \ | ||
| locale-gen "en_US.UTF-8" | ||
|
|
||
| RUN mkdir /tmp/x86 /crossrootfs && \ | ||
| curl -s -o /tmp/build-rootfs.sh https://raw.githubusercontent.com/dotnet/runtime/main/eng/common/cross/build-rootfs.sh && \ | ||
| curl -s -o /tmp/x86/sources.list.xenial https://raw.githubusercontent.com/dotnet/runtime/main/eng/common/cross/x86/sources.list.xenial && \ | ||
| chmod a+x /tmp/build-rootfs.sh && \ | ||
| /tmp/build-rootfs.sh x86 --skipunmount --rootfsdir /crossrootfs | ||
|
|
||
| ENV ROOTFS_DIR=/crossrootfs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| function calculate_build_id() | ||
| { | ||
| local TAG=$1 | ||
| local REGEX='-(preview|rc|rtm)\.[0-9]\.([0-9]{5})\.([0-9]{1,2})' | ||
|
|
||
| if [[ $TAG =~ $REGEX ]] | ||
| then | ||
| local MAJOR=${BASH_REMATCH[2]} | ||
| local MINOR=${BASH_REMATCH[3]} | ||
|
|
||
| YEAR=$((MAJOR / 1000 + 2000)) | ||
| MONTH=$(((MAJOR % 1000) / 50)) | ||
| DAY=$((MAJOR % 50)) | ||
|
|
||
| DATE=$((YEAR * 10000 + MONTH * 100 + DAY)) | ||
|
|
||
| OFFICIALBUILDID="${DATE}.${MINOR}" | ||
| else | ||
| OFFICIALBUILDID=$(date +%Y%m%d).99 | ||
| fi | ||
| } | ||
|
|
||
| function get_runtime_docker() | ||
| { | ||
| DOTNET_DOCKER_TAG="mcr.microsoft.com/dotnet-buildtools/prereqs:$(curl -s https://raw.githubusercontent.com/dotnet/versions/master/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json | jq -r '.repos[0].images[] | select(.platforms[0].dockerfile | contains("freebsd/12")) | .platforms[0].simpleTags[0]')" | ||
| } |
This file was deleted.
Oops, something went wrong.
38 changes: 38 additions & 0 deletions
38
patches/runtime/0001-Fix-duplicate-definition-of-_RUNTIME_FUNCTION-on-lin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| From be37ed0c17773bb0508943b74fd3d8a92f68b9d5 Mon Sep 17 00:00:00 2001 | ||
| From: ta264 <[email protected]> | ||
| Date: Mon, 11 Apr 2022 19:20:20 +0100 | ||
| Subject: [PATCH] Fix duplicate definition of _RUNTIME_FUNCTION on linux-x86 | ||
|
|
||
| --- | ||
| src/coreclr/inc/clrnt.h | 15 --------------- | ||
| 1 file changed, 15 deletions(-) | ||
|
|
||
| diff --git a/src/coreclr/inc/clrnt.h b/src/coreclr/inc/clrnt.h | ||
| index a833da67bcc..b42ae8a7c9b 100644 | ||
| --- a/src/coreclr/inc/clrnt.h | ||
| +++ b/src/coreclr/inc/clrnt.h | ||
| @@ -833,21 +833,6 @@ RtlVirtualUnwind_Unsafe( | ||
| // | ||
|
|
||
| #ifdef TARGET_X86 | ||
| -#ifndef TARGET_UNIX | ||
| -// | ||
| -// x86 ABI does not define RUNTIME_FUNCTION. Define our own to allow unification between x86 and other platforms. | ||
| -// | ||
| -#ifdef HOST_X86 | ||
| -typedef struct _RUNTIME_FUNCTION { | ||
| - DWORD BeginAddress; | ||
| - DWORD UnwindData; | ||
| -} RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; | ||
| - | ||
| -typedef struct _DISPATCHER_CONTEXT { | ||
| - _EXCEPTION_REGISTRATION_RECORD* RegistrationPointer; | ||
| -} DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; | ||
| -#endif // HOST_X86 | ||
| -#endif // !TARGET_UNIX | ||
|
|
||
| #define RUNTIME_FUNCTION__BeginAddress(prf) (prf)->BeginAddress | ||
| #define RUNTIME_FUNCTION__SetBeginAddress(prf,addr) ((prf)->BeginAddress = (addr)) | ||
| -- | ||
| 2.25.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From 7f77f930426f5ac3a992e58c93c8b2b50d40cac5 Mon Sep 17 00:00:00 2001 | ||
| From: ta264 <[email protected]> | ||
| Date: Mon, 11 Apr 2022 21:17:32 +0100 | ||
| Subject: [PATCH] Build Crossgen2 | ||
|
|
||
| --- | ||
| .../Microsoft.NETCore.App.Crossgen2.sfxproj | 3 ++- | ||
| 1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj | ||
| index 4c3c0f82a1a..9578320427b 100644 | ||
| --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj | ||
| +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj | ||
| @@ -11,7 +11,7 @@ | ||
| <ArchiveName>dotnet-crossgen2</ArchiveName> | ||
| <SharedFrameworkHostFileNameOverride>crossgen2</SharedFrameworkHostFileNameOverride> | ||
| <!-- Build this pack for any RID if building from source. Otherwise, only build select RIDs. --> | ||
| - <RuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers> | ||
| + <RuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' != 'true'">linux-x64;linux-x86;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64;win-arm</RuntimeIdentifiers> | ||
| <GenerateInstallers>false</GenerateInstallers> | ||
| <GetSharedFrameworkFilesForReadyToRunDependsOn> | ||
| AddRuntimeFilesToPackage; | ||
| @@ -38,6 +38,7 @@ | ||
| <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)jitinterface_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" /> | ||
| <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_win_x86_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" /> | ||
| <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_win_arm_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" /> | ||
| + <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_unix_x86_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" /> | ||
| <NativeRuntimeAsset Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_unix_arm_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" /> | ||
| <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_win_x64_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" /> | ||
| <NativeRuntimeAsset Condition="'$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'x64'" Include="$(CoreCLRCrossgen2Dir)$(LibPrefix)clrjit_win_arm64_$(TargetArchitecture)$(LibSuffix)" TargetPath="tools/" /> | ||
| -- | ||
| 2.25.1 | ||
|
|