[arch-commits] Commit in dotnet-core-3.1/repos/community-x86_64 (10 files)
Maxime Gauduin
alucryd at gemini.archlinux.org
Fri Nov 12 21:01:56 UTC 2021
Date: Friday, November 12, 2021 @ 21:01:56
Author: alucryd
Revision: 1044837
archrelease: copy trunk to community-x86_64
Added:
dotnet-core-3.1/repos/community-x86_64/9999-core-setup-fix-computed-rid.patch
(from rev 1044836, dotnet-core-3.1/trunk/9999-core-setup-fix-computed-rid.patch)
dotnet-core-3.1/repos/community-x86_64/9999-corefx-add-arch-rids.patch
(from rev 1044836, dotnet-core-3.1/trunk/9999-corefx-add-arch-rids.patch)
dotnet-core-3.1/repos/community-x86_64/9999-corefx-fix-build-clang10.patch
(from rev 1044836, dotnet-core-3.1/trunk/9999-corefx-fix-build-clang10.patch)
dotnet-core-3.1/repos/community-x86_64/PKGBUILD
(from rev 1044836, dotnet-core-3.1/trunk/PKGBUILD)
dotnet-core-3.1/repos/community-x86_64/dotnet-source-build-coreclr-tools-path.patch
(from rev 1044836, dotnet-core-3.1/trunk/dotnet-source-build-coreclr-tools-path.patch)
Deleted:
dotnet-core-3.1/repos/community-x86_64/9999-core-setup-fix-computed-rid.patch
dotnet-core-3.1/repos/community-x86_64/9999-corefx-add-arch-rids.patch
dotnet-core-3.1/repos/community-x86_64/9999-corefx-fix-build-clang10.patch
dotnet-core-3.1/repos/community-x86_64/PKGBUILD
dotnet-core-3.1/repos/community-x86_64/dotnet-source-build-coreclr-tools-path.patch
----------------------------------------------+
9999-core-setup-fix-computed-rid.patch | 150 +++++-----
9999-corefx-add-arch-rids.patch | 182 ++++++-------
9999-corefx-fix-build-clang10.patch | 26 -
PKGBUILD | 342 ++++++++++++-------------
dotnet-source-build-coreclr-tools-path.patch | 30 +-
5 files changed, 365 insertions(+), 365 deletions(-)
Deleted: 9999-core-setup-fix-computed-rid.patch
===================================================================
--- 9999-core-setup-fix-computed-rid.patch 2021-11-12 21:01:47 UTC (rev 1044836)
+++ 9999-core-setup-fix-computed-rid.patch 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -1,75 +0,0 @@
-diff -rupN core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388.orig/src/corehost/build.sh core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388/src/corehost/build.sh
---- core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388.orig/src/corehost/build.sh 2021-03-12 17:57:36.793772783 +0100
-+++ core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388/src/corehost/build.sh 2021-03-12 18:00:39.490798906 +0100
-@@ -1,61 +1,5 @@
- #!/usr/bin/env bash
-
--init_rid_plat()
--{
-- # Detect Distro
-- if [ $__CrossBuild == 1 ]; then
-- if [ -z $ROOTFS_DIR ]; then
-- echo "ROOTFS_DIR is not defined."
-- exit -1
-- else
-- if [ -e $ROOTFS_DIR/etc/os-release ]; then
-- source $ROOTFS_DIR/etc/os-release
-- __rid_plat="$ID.$VERSION_ID"
-- if [[ "$ID" == "alpine" ]]; then
-- __rid_plat="linux-musl"
-- fi
-- fi
-- echo "__rid_plat is $__rid_plat"
-- fi
-- else
-- __rid_plat=""
-- if [ -e /etc/os-release ]; then
-- source /etc/os-release
-- if [[ "$ID" == "rhel" ]]; then
-- # remove the last version number
-- VERSION_ID=${VERSION_ID%.*}
-- fi
-- __rid_plat="$ID.$VERSION_ID"
-- if [[ "$ID" == "alpine" ]]; then
-- __rid_plat="linux-musl"
-- fi
-- elif [ -e /etc/redhat-release ]; then
-- local redhatRelease=$(</etc/redhat-release)
-- if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
-- __rid_plat="rhel.6"
-- fi
-- fi
-- fi
--
-- if [ "$(uname -s)" == "Darwin" ]; then
-- __rid_plat=osx.10.12
-- fi
-- if [ "$(uname -s)" == "FreeBSD" ]; then
-- major_ver=`uname -U | cut -b1-2`
-- __rid_plat=freebsd.$major_ver
-- fi
--
-- if [ $__linkPortable == 1 ]; then
-- if [ "$(uname -s)" == "Darwin" ]; then
-- __rid_plat="osx"
-- elif [ "$(uname -s)" == "FreeBSD" ]; then
-- __rid_plat="freebsd"
-- else
-- __rid_plat="linux"
-- fi
-- fi
--}
--
- usage()
- {
- echo "Usage: $0 --configuration <configuration> --arch <Architecture> --hostver <Dotnet exe version> --apphostver <app host exe version> --fxrver <HostFxr library version> --policyver <HostPolicy library version> --commithash <Git commit hash> [--xcompiler <Cross C++ Compiler>]"
-@@ -186,8 +130,7 @@ fi
-
- # __base_rid is the base RID that corehost is shipped for, effectively, the name of the folder in "runtimes/{__base_rid}/native/" inside the nupkgs.
- # __rid_plat is the OS portion of the RID.
--__rid_plat=
--init_rid_plat
-+__rid_plat="arch"
-
- if [ -z $__rid_plat ]; then
- echo "Unknown base rid (eg.: osx.10.12, ubuntu.14.04) being targeted"
Copied: dotnet-core-3.1/repos/community-x86_64/9999-core-setup-fix-computed-rid.patch (from rev 1044836, dotnet-core-3.1/trunk/9999-core-setup-fix-computed-rid.patch)
===================================================================
--- 9999-core-setup-fix-computed-rid.patch (rev 0)
+++ 9999-core-setup-fix-computed-rid.patch 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -0,0 +1,75 @@
+diff -rupN core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388.orig/src/corehost/build.sh core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388/src/corehost/build.sh
+--- core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388.orig/src/corehost/build.sh 2021-03-12 17:57:36.793772783 +0100
++++ core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388/src/corehost/build.sh 2021-03-12 18:00:39.490798906 +0100
+@@ -1,61 +1,5 @@
+ #!/usr/bin/env bash
+
+-init_rid_plat()
+-{
+- # Detect Distro
+- if [ $__CrossBuild == 1 ]; then
+- if [ -z $ROOTFS_DIR ]; then
+- echo "ROOTFS_DIR is not defined."
+- exit -1
+- else
+- if [ -e $ROOTFS_DIR/etc/os-release ]; then
+- source $ROOTFS_DIR/etc/os-release
+- __rid_plat="$ID.$VERSION_ID"
+- if [[ "$ID" == "alpine" ]]; then
+- __rid_plat="linux-musl"
+- fi
+- fi
+- echo "__rid_plat is $__rid_plat"
+- fi
+- else
+- __rid_plat=""
+- if [ -e /etc/os-release ]; then
+- source /etc/os-release
+- if [[ "$ID" == "rhel" ]]; then
+- # remove the last version number
+- VERSION_ID=${VERSION_ID%.*}
+- fi
+- __rid_plat="$ID.$VERSION_ID"
+- if [[ "$ID" == "alpine" ]]; then
+- __rid_plat="linux-musl"
+- fi
+- elif [ -e /etc/redhat-release ]; then
+- local redhatRelease=$(</etc/redhat-release)
+- if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
+- __rid_plat="rhel.6"
+- fi
+- fi
+- fi
+-
+- if [ "$(uname -s)" == "Darwin" ]; then
+- __rid_plat=osx.10.12
+- fi
+- if [ "$(uname -s)" == "FreeBSD" ]; then
+- major_ver=`uname -U | cut -b1-2`
+- __rid_plat=freebsd.$major_ver
+- fi
+-
+- if [ $__linkPortable == 1 ]; then
+- if [ "$(uname -s)" == "Darwin" ]; then
+- __rid_plat="osx"
+- elif [ "$(uname -s)" == "FreeBSD" ]; then
+- __rid_plat="freebsd"
+- else
+- __rid_plat="linux"
+- fi
+- fi
+-}
+-
+ usage()
+ {
+ echo "Usage: $0 --configuration <configuration> --arch <Architecture> --hostver <Dotnet exe version> --apphostver <app host exe version> --fxrver <HostFxr library version> --policyver <HostPolicy library version> --commithash <Git commit hash> [--xcompiler <Cross C++ Compiler>]"
+@@ -186,8 +130,7 @@ fi
+
+ # __base_rid is the base RID that corehost is shipped for, effectively, the name of the folder in "runtimes/{__base_rid}/native/" inside the nupkgs.
+ # __rid_plat is the OS portion of the RID.
+-__rid_plat=
+-init_rid_plat
++__rid_plat="arch"
+
+ if [ -z $__rid_plat ]; then
+ echo "Unknown base rid (eg.: osx.10.12, ubuntu.14.04) being targeted"
Deleted: 9999-corefx-add-arch-rids.patch
===================================================================
--- 9999-corefx-add-arch-rids.patch 2021-11-12 21:01:47 UTC (rev 1044836)
+++ 9999-corefx-add-arch-rids.patch 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -1,91 +0,0 @@
-From c70ef244c862e8e13ff6552ee829e968186e0f45 Mon Sep 17 00:00:00 2001
-From: Omair Majid <omajid at redhat.com>
-Date: Fri, 8 Nov 2019 21:01:11 -0500
-Subject: [PATCH] Add runtime id for Arch Linux
-
-Like gentoo, Arch Linux is a rolling release and doesn't have explicit
-version numbers.
-
- $ cat /etc/os-release
- NAME="Arch Linux"
- PRETTY_NAME="Arch Linux"
- ID=arch
- BUILD_ID=rolling
- ANSI_COLOR="0;36"
- HOME_URL="https://www.archlinux.org/"
- DOCUMENTATION_URL="https://wiki.archlinux.org/"
- SUPPORT_URL="https://bbs.archlinux.org/"
- BUG_REPORT_URL="https://bugs.archlinux.org/"
- LOGO=archlinux
----
- .../runtime.compatibility.json | 17 +++++++++++++++++
- .../Microsoft.NETCore.Platforms/runtime.json | 11 +++++++++++
- .../runtimeGroups.props | 5 +++++
- 3 files changed, 33 insertions(+)
-
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-index 2a196ecc9fc7..d273634527ef 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-@@ -270,6 +270,23 @@
- "any",
- "base"
- ],
-+ "arch": [
-+ "arch",
-+ "linux",
-+ "unix",
-+ "any",
-+ "base"
-+ ],
-+ "arch-x64": [
-+ "arch-x64",
-+ "arch",
-+ "linux-x64",
-+ "linux",
-+ "unix-x64",
-+ "unix",
-+ "any",
-+ "base"
-+ ],
- "base": [
- "base"
- ],
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
-index e70f2da7e668..5b2f70f44b9e 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtime.json
-+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
-@@ -121,6 +121,17 @@
- "any"
- ]
- },
-+ "arch": {
-+ "#import": [
-+ "linux"
-+ ]
-+ },
-+ "arch-x64": {
-+ "#import": [
-+ "arch",
-+ "linux-x64"
-+ ]
-+ },
- "base": {
- "#import": []
- },
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-index 6c95b67819be..aa31cac61f34 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-@@ -25,6 +25,11 @@
- <Versions>21</Versions>
- </RuntimeGroup>
-
-+ <RuntimeGroup Include="arch">
-+ <Parent>linux</Parent>
-+ <Architectures>x64</Architectures>
-+ </RuntimeGroup>
-+
- <RuntimeGroup Include="centos">
- <Parent>rhel</Parent>
- <Architectures>x64</Architectures>
Copied: dotnet-core-3.1/repos/community-x86_64/9999-corefx-add-arch-rids.patch (from rev 1044836, dotnet-core-3.1/trunk/9999-corefx-add-arch-rids.patch)
===================================================================
--- 9999-corefx-add-arch-rids.patch (rev 0)
+++ 9999-corefx-add-arch-rids.patch 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -0,0 +1,91 @@
+From c70ef244c862e8e13ff6552ee829e968186e0f45 Mon Sep 17 00:00:00 2001
+From: Omair Majid <omajid at redhat.com>
+Date: Fri, 8 Nov 2019 21:01:11 -0500
+Subject: [PATCH] Add runtime id for Arch Linux
+
+Like gentoo, Arch Linux is a rolling release and doesn't have explicit
+version numbers.
+
+ $ cat /etc/os-release
+ NAME="Arch Linux"
+ PRETTY_NAME="Arch Linux"
+ ID=arch
+ BUILD_ID=rolling
+ ANSI_COLOR="0;36"
+ HOME_URL="https://www.archlinux.org/"
+ DOCUMENTATION_URL="https://wiki.archlinux.org/"
+ SUPPORT_URL="https://bbs.archlinux.org/"
+ BUG_REPORT_URL="https://bugs.archlinux.org/"
+ LOGO=archlinux
+---
+ .../runtime.compatibility.json | 17 +++++++++++++++++
+ .../Microsoft.NETCore.Platforms/runtime.json | 11 +++++++++++
+ .../runtimeGroups.props | 5 +++++
+ 3 files changed, 33 insertions(+)
+
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+index 2a196ecc9fc7..d273634527ef 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
++++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+@@ -270,6 +270,23 @@
+ "any",
+ "base"
+ ],
++ "arch": [
++ "arch",
++ "linux",
++ "unix",
++ "any",
++ "base"
++ ],
++ "arch-x64": [
++ "arch-x64",
++ "arch",
++ "linux-x64",
++ "linux",
++ "unix-x64",
++ "unix",
++ "any",
++ "base"
++ ],
+ "base": [
+ "base"
+ ],
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
+index e70f2da7e668..5b2f70f44b9e 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
++++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
+@@ -121,6 +121,17 @@
+ "any"
+ ]
+ },
++ "arch": {
++ "#import": [
++ "linux"
++ ]
++ },
++ "arch-x64": {
++ "#import": [
++ "arch",
++ "linux-x64"
++ ]
++ },
+ "base": {
+ "#import": []
+ },
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+index 6c95b67819be..aa31cac61f34 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
++++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+@@ -25,6 +25,11 @@
+ <Versions>21</Versions>
+ </RuntimeGroup>
+
++ <RuntimeGroup Include="arch">
++ <Parent>linux</Parent>
++ <Architectures>x64</Architectures>
++ </RuntimeGroup>
++
+ <RuntimeGroup Include="centos">
+ <Parent>rhel</Parent>
+ <Architectures>x64</Architectures>
Deleted: 9999-corefx-fix-build-clang10.patch
===================================================================
--- 9999-corefx-fix-build-clang10.patch 2021-11-12 21:01:47 UTC (rev 1044836)
+++ 9999-corefx-fix-build-clang10.patch 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -1,13 +0,0 @@
-diff -rupN corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e.orig/src/Native/Unix/CMakeLists.txt corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/src/Native/Unix/CMakeLists.txt
---- corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e.orig/src/Native/Unix/CMakeLists.txt 2021-07-27 14:26:14.020698478 +0000
-+++ corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/src/Native/Unix/CMakeLists.txt 2021-07-27 14:26:52.279672576 +0000
-@@ -26,6 +26,8 @@ add_compile_options(-Wno-empty-translati
- add_compile_options(-Wno-cast-align)
- add_compile_options(-Wno-typedef-redefinition)
- add_compile_options(-Wno-c11-extensions)
-+add_compile_options(-Wno-sign-conversion)
-+add_compile_options(-Wno-unused-result)
- add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
- add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
- add_compile_options(-g)
-
Copied: dotnet-core-3.1/repos/community-x86_64/9999-corefx-fix-build-clang10.patch (from rev 1044836, dotnet-core-3.1/trunk/9999-corefx-fix-build-clang10.patch)
===================================================================
--- 9999-corefx-fix-build-clang10.patch (rev 0)
+++ 9999-corefx-fix-build-clang10.patch 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -0,0 +1,13 @@
+diff -rupN corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e.orig/src/Native/Unix/CMakeLists.txt corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/src/Native/Unix/CMakeLists.txt
+--- corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e.orig/src/Native/Unix/CMakeLists.txt 2021-07-27 14:26:14.020698478 +0000
++++ corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/src/Native/Unix/CMakeLists.txt 2021-07-27 14:26:52.279672576 +0000
+@@ -26,6 +26,8 @@ add_compile_options(-Wno-empty-translati
+ add_compile_options(-Wno-cast-align)
+ add_compile_options(-Wno-typedef-redefinition)
+ add_compile_options(-Wno-c11-extensions)
++add_compile_options(-Wno-sign-conversion)
++add_compile_options(-Wno-unused-result)
+ add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
+ add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
+ add_compile_options(-g)
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-11-12 21:01:47 UTC (rev 1044836)
+++ PKGBUILD 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -1,171 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Kristian Mosegaard <kristian at mosen.me>
-# Contributor: Max Liebkies <mail at maxliebkies.de>
-# Contributor: Krzysztof Bogacki <krzysztof.bogacki at leancode.pl>
-
-pkgbase=dotnet-core-3.1
-pkgname=(
- dotnet-runtime-3.1
- aspnet-runtime-3.1
- dotnet-sdk-3.1
- dotnet-targeting-pack-3.1
- aspnet-targeting-pack-3.1
-)
-pkgver=3.1.17.sdk117
-pkgrel=1
-arch=(x86_64)
-url=https://www.microsoft.com/net/core
-license=(MIT)
-makedepends=(
- bash
- clang
- cmake
- curl
- #dotnet-sdk-3.1
- git
- icu
- inetutils
- krb5
- libgit2
- libunwind
- libxml2
- lldb
- llvm
- lttng-ust
- nodejs
- openssl
- systemd
- zlib
-)
-options=(staticlibs)
-_tag=6e438c30c8db69f7e9b26e4e47a87a7ff90d80cf
-source=(
- dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
- dotnet-source-build-coreclr-tools-path.patch
- 9999-corefx-add-arch-rids.patch
- 9999-corefx-fix-build-clang10.patch
- 9999-core-setup-fix-computed-rid.patch
-)
-b2sums=('SKIP'
- 'bd6bba84f851ce25b8dda085af1415acc14e50c6c99712dc03d51cdb3dbb362e7dc0ee16d54b27a1d46eb0db03be5dd0c1dae6c2a8a9ab0e46b2bf6c76292989'
- '2e56d6458c50c95e5d2489235b13727c8d708162318cad1cc05b225d47d736dbd9bc897eb3eb7014f716423dcfef67178efbdee41be30e64bac120912efeabd4'
- '831a76ec9c12498edcb0e8085f3f725e8ebecc951c8ae9cbd871330ffb813cce42e03e28c0fe1493cdd629936feff98ae26f48f50435039ac38fbba53a9371ac'
- 'bd9e0cec11937997df2764bccfdb9468af8ffabd85597447a3de52c801cd6c2717fb297f4bad00784568c67b4f1648038cc0ffdccc7f52c63935562bc2f2ef9a')
-
-prepare() {
- #cp -r /usr/share/dotnet .
-
- cd dotnet-source-build
-
- patch -Np1 -i ../dotnet-source-build-coreclr-tools-path.patch
-
- [ -d patches/corefx ] || mkdir patches/corefx
- cp ../9999-corefx-add-arch-rids.patch patches/corefx/
- cp ../9999-corefx-fix-build-clang10.patch patches/corefx/
- [ -d patches/core-setup ] || mkdir patches/core-setup
- cp ../9999-core-setup-fix-computed-rid.patch patches/core-setup/
-}
-
-pkgver() {
- cd dotnet-source-build
-
- if [[ $(git describe --tags) != v3.1.*-runtime ]]; then
- exit 1
- fi
-
- local _runtimever=$(xmllint --xpath "//Dependency[@Name='Microsoft.NETCore.App.Runtime.linux-x64']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//')
- local _sdkver=$(xmllint --xpath "//Dependency[@Name='Microsoft.NET.Sdk']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//; s/-rtm.*//; s/-servicing.*//')
-
- echo "${_runtimever}.sdk${_sdkver##*.}"
-}
-
-build() {
- cd dotnet-source-build
-
- export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
-
- ./build.sh \
- /p:ArchiveDownloadedPackages=true \
- /p:ContinueOnPrebuiltBaselineError=true \
- /p:SkipPortableRuntimeBuild=true \
- /p:SkipPrebuiltEnforcement=true \
- /p:UseSystemLibraries=true \
- /p:UseSystemLibunwind=true
- #--with-sdk "${srcdir}"/dotnet \
-}
-
-package_dotnet-runtime-3.1() {
- pkgdesc='The .NET Core runtime'
- depends=(
- dotnet-host
- gcc-libs
- glibc
- icu
- libcurl.so
- libgssapi_krb5.so
- libunwind
- openssl
- zlib
- )
-
- optdepends=('lttng-ust: CoreCLR tracing')
-
- cd dotnet-source-build/artifacts/x64/Release
-
- install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
- bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.NETCore.App
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime-3.1
-}
-
-package_aspnet-runtime-3.1() {
- pkgdesc='The ASP.NET Core runtime'
- depends=(dotnet-runtime-3.1)
-
- cd dotnet-source-build/artifacts/x64/Release
-
- install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
- bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.AspNetCore.App
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-runtime-3.1
-}
-
-package_dotnet-sdk-3.1() {
- pkgdesc='The .NET Core SDK'
- depends=(
- dotnet-runtime-3.1
- dotnet-targeting-pack-3.1
- glibc
- gcc-libs
- netstandard-targeting-pack
- )
- optdepends=('aspnet-targeting-pack-3.1: Build ASP.NET Core applications')
-
- cd dotnet-source-build/artifacts/x64/Release
-
- install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
- bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner sdk templates
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-sdk-3.1
-}
-
-package_dotnet-targeting-pack-3.1() {
- pkgdesc='The .NET Core targeting pack'
- depends=(netstandard-targeting-pack)
-
- cd dotnet-source-build/artifacts/x64/Release
-
- install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
- bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.NETCore.App.{Host.arch-x64,Ref}
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-targeting-pack-3.1
-}
-
-package_aspnet-targeting-pack-3.1() {
- pkgdesc='The ASP.NET Core targeting pack'
- depends=(dotnet-targeting-pack-3.1)
-
- cd dotnet-source-build/artifacts/x64/Release
-
- install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
- bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.AspNetCore.App.Ref
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-targeting-pack-3.1
-}
-
-# vim: ts=2 sw=2 et:
Copied: dotnet-core-3.1/repos/community-x86_64/PKGBUILD (from rev 1044836, dotnet-core-3.1/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -0,0 +1,171 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Kristian Mosegaard <kristian at mosen.me>
+# Contributor: Max Liebkies <mail at maxliebkies.de>
+# Contributor: Krzysztof Bogacki <krzysztof.bogacki at leancode.pl>
+
+pkgbase=dotnet-core-3.1
+pkgname=(
+ dotnet-runtime-3.1
+ aspnet-runtime-3.1
+ dotnet-sdk-3.1
+ dotnet-targeting-pack-3.1
+ aspnet-targeting-pack-3.1
+)
+pkgver=3.1.20.sdk120
+pkgrel=1
+arch=(x86_64)
+url=https://www.microsoft.com/net/core
+license=(MIT)
+makedepends=(
+ bash
+ clang
+ cmake
+ curl
+ #dotnet-sdk-3.1
+ git
+ icu
+ inetutils
+ krb5
+ libgit2
+ libunwind
+ libxml2
+ lldb
+ llvm
+ lttng-ust2.12
+ nodejs
+ openssl
+ systemd
+ zlib
+)
+options=(staticlibs)
+_tag=61c1106e21baad31a946238a4aa2b27fde415c97
+source=(
+ dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
+ dotnet-source-build-coreclr-tools-path.patch
+ 9999-corefx-add-arch-rids.patch
+ 9999-corefx-fix-build-clang10.patch
+ 9999-core-setup-fix-computed-rid.patch
+)
+b2sums=('SKIP'
+ 'bd6bba84f851ce25b8dda085af1415acc14e50c6c99712dc03d51cdb3dbb362e7dc0ee16d54b27a1d46eb0db03be5dd0c1dae6c2a8a9ab0e46b2bf6c76292989'
+ '2e56d6458c50c95e5d2489235b13727c8d708162318cad1cc05b225d47d736dbd9bc897eb3eb7014f716423dcfef67178efbdee41be30e64bac120912efeabd4'
+ '831a76ec9c12498edcb0e8085f3f725e8ebecc951c8ae9cbd871330ffb813cce42e03e28c0fe1493cdd629936feff98ae26f48f50435039ac38fbba53a9371ac'
+ 'bd9e0cec11937997df2764bccfdb9468af8ffabd85597447a3de52c801cd6c2717fb297f4bad00784568c67b4f1648038cc0ffdccc7f52c63935562bc2f2ef9a')
+
+prepare() {
+ #cp -r /usr/share/dotnet .
+
+ cd dotnet-source-build
+
+ patch -Np1 -i ../dotnet-source-build-coreclr-tools-path.patch
+
+ [ -d patches/corefx ] || mkdir patches/corefx
+ cp ../9999-corefx-add-arch-rids.patch patches/corefx/
+ cp ../9999-corefx-fix-build-clang10.patch patches/corefx/
+ [ -d patches/core-setup ] || mkdir patches/core-setup
+ cp ../9999-core-setup-fix-computed-rid.patch patches/core-setup/
+}
+
+pkgver() {
+ cd dotnet-source-build
+
+ if [[ $(git describe --tags) != v3.1.*-runtime && $(git describe --tags) != v3.1.*-SDK ]]; then
+ exit 1
+ fi
+
+ local _runtimever=$(xmllint --xpath "//Dependency[@Name='Microsoft.NETCore.App.Runtime.linux-x64']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//')
+ local _sdkver=$(xmllint --xpath "//Dependency[@Name='Microsoft.NET.Sdk']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//; s/-rtm.*//; s/-servicing.*//')
+
+ echo "${_runtimever}.sdk${_sdkver##*.}"
+}
+
+build() {
+ cd dotnet-source-build
+
+ export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
+
+ ./build.sh \
+ /p:ArchiveDownloadedPackages=true \
+ /p:ContinueOnPrebuiltBaselineError=true \
+ /p:SkipPortableRuntimeBuild=true \
+ /p:SkipPrebuiltEnforcement=true \
+ /p:UseSystemLibraries=true \
+ /p:UseSystemLibunwind=true
+ #--with-sdk "${srcdir}"/dotnet \
+}
+
+package_dotnet-runtime-3.1() {
+ pkgdesc='The .NET Core runtime'
+ depends=(
+ dotnet-host
+ gcc-libs
+ glibc
+ icu
+ libcurl.so
+ libgssapi_krb5.so
+ libunwind
+ openssl
+ zlib
+ )
+
+ optdepends=('lttng-ust2.12: CoreCLR tracing')
+
+ cd dotnet-source-build/artifacts/x64/Release
+
+ install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+ bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.NETCore.App
+ ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime-3.1
+}
+
+package_aspnet-runtime-3.1() {
+ pkgdesc='The ASP.NET Core runtime'
+ depends=(dotnet-runtime-3.1)
+
+ cd dotnet-source-build/artifacts/x64/Release
+
+ install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+ bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.AspNetCore.App
+ ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-runtime-3.1
+}
+
+package_dotnet-sdk-3.1() {
+ pkgdesc='The .NET Core SDK'
+ depends=(
+ dotnet-runtime-3.1
+ dotnet-targeting-pack-3.1
+ glibc
+ gcc-libs
+ netstandard-targeting-pack
+ )
+ optdepends=('aspnet-targeting-pack-3.1: Build ASP.NET Core applications')
+
+ cd dotnet-source-build/artifacts/x64/Release
+
+ install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+ bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner sdk templates
+ ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-sdk-3.1
+}
+
+package_dotnet-targeting-pack-3.1() {
+ pkgdesc='The .NET Core targeting pack'
+ depends=(netstandard-targeting-pack)
+
+ cd dotnet-source-build/artifacts/x64/Release
+
+ install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+ bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.NETCore.App.{Host.arch-x64,Ref}
+ ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-targeting-pack-3.1
+}
+
+package_aspnet-targeting-pack-3.1() {
+ pkgdesc='The ASP.NET Core targeting pack'
+ depends=(dotnet-targeting-pack-3.1)
+
+ cd dotnet-source-build/artifacts/x64/Release
+
+ install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+ bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.AspNetCore.App.Ref
+ ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-targeting-pack-3.1
+}
+
+# vim: ts=2 sw=2 et:
Deleted: dotnet-source-build-coreclr-tools-path.patch
===================================================================
--- dotnet-source-build-coreclr-tools-path.patch 2021-11-12 21:01:47 UTC (rev 1044836)
+++ dotnet-source-build-coreclr-tools-path.patch 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -1,15 +0,0 @@
-diff -rupN dotnet-source-build.orig/Directory.Build.props dotnet-source-build/Directory.Build.props
---- dotnet-source-build.orig/Directory.Build.props 2021-04-19 08:47:13.811951924 +0000
-+++ dotnet-source-build/Directory.Build.props 2021-04-19 08:47:59.914693354 +0000
-@@ -133,8 +133,8 @@
- <AspNetRazorBuildServerLogDir>$(BaseOutputPath)aspnet-debug</AspNetRazorBuildServerLogDir>
- <AspNetRazorBuildServerLogFile>$(AspNetRazorBuildServerLogDir)razor-build-server.log</AspNetRazorBuildServerLogFile>
- <IlasmPath Condition="'$(OfflineBuild)' != 'true'">invalid: ILAsm is not expected to be needed in the online build</IlasmPath>
-- <IlasmPath Condition="'$(OfflineBuild)' == 'true'">$(PrebuiltSourceBuiltPackagesPath)coreclr-tools/$(BuildArchitecture)/ilasm</IlasmPath>
-- <IldasmPath Condition="'$(OfflineBuild)' != 'true'">$(ToolPackageExtractDir)coreclr-tools/$(BuildArchitecture)/ildasm</IldasmPath>
-+ <IlasmPath Condition="'$(OfflineBuild)' == 'true'">$(PrebuiltSourceBuiltPackagesPath)coreclr-tools/ilasm</IlasmPath>
-+ <IldasmPath Condition="'$(OfflineBuild)' != 'true'">$(ToolPackageExtractDir)coreclr-tools/ildasm</IldasmPath>
- <IldasmPath Condition="'$(OfflineBuild)' == 'true'">invalid: ILDasm is not expected to be needed in the offline build</IldasmPath>
- <!-- Dir where git info is generated during online builds. -->
- <GitInfoOutputDir>$(BaseOutputPath)git-info/</GitInfoOutputDir>
-
Copied: dotnet-core-3.1/repos/community-x86_64/dotnet-source-build-coreclr-tools-path.patch (from rev 1044836, dotnet-core-3.1/trunk/dotnet-source-build-coreclr-tools-path.patch)
===================================================================
--- dotnet-source-build-coreclr-tools-path.patch (rev 0)
+++ dotnet-source-build-coreclr-tools-path.patch 2021-11-12 21:01:56 UTC (rev 1044837)
@@ -0,0 +1,15 @@
+diff -rupN dotnet-source-build.orig/Directory.Build.props dotnet-source-build/Directory.Build.props
+--- dotnet-source-build.orig/Directory.Build.props 2021-04-19 08:47:13.811951924 +0000
++++ dotnet-source-build/Directory.Build.props 2021-04-19 08:47:59.914693354 +0000
+@@ -133,8 +133,8 @@
+ <AspNetRazorBuildServerLogDir>$(BaseOutputPath)aspnet-debug</AspNetRazorBuildServerLogDir>
+ <AspNetRazorBuildServerLogFile>$(AspNetRazorBuildServerLogDir)razor-build-server.log</AspNetRazorBuildServerLogFile>
+ <IlasmPath Condition="'$(OfflineBuild)' != 'true'">invalid: ILAsm is not expected to be needed in the online build</IlasmPath>
+- <IlasmPath Condition="'$(OfflineBuild)' == 'true'">$(PrebuiltSourceBuiltPackagesPath)coreclr-tools/$(BuildArchitecture)/ilasm</IlasmPath>
+- <IldasmPath Condition="'$(OfflineBuild)' != 'true'">$(ToolPackageExtractDir)coreclr-tools/$(BuildArchitecture)/ildasm</IldasmPath>
++ <IlasmPath Condition="'$(OfflineBuild)' == 'true'">$(PrebuiltSourceBuiltPackagesPath)coreclr-tools/ilasm</IlasmPath>
++ <IldasmPath Condition="'$(OfflineBuild)' != 'true'">$(ToolPackageExtractDir)coreclr-tools/ildasm</IldasmPath>
+ <IldasmPath Condition="'$(OfflineBuild)' == 'true'">invalid: ILDasm is not expected to be needed in the offline build</IldasmPath>
+ <!-- Dir where git info is generated during online builds. -->
+ <GitInfoOutputDir>$(BaseOutputPath)git-info/</GitInfoOutputDir>
+
More information about the arch-commits
mailing list