[arch-commits] Commit in dotnet-core-3.1/trunk (2 files)

[Maxime Gauduin]

    Date: Monday, April 19, 2021 @ 11:50:08
  Author: alucryd
Revision: 919976

upgpkg: dotnet-core-3.1 3.1.14.sdk114-1

Added:
  dotnet-core-3.1/trunk/dotnet-source-build-coreclr-tools-path.patch
Modified:
  dotnet-core-3.1/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   37 ++++++++++++++-----------
 dotnet-source-build-coreclr-tools-path.patch |   15 ++++++++++
 2 files changed, 37 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-19 11:28:31 UTC (rev 919975)
+++ PKGBUILD	2021-04-19 11:50:08 UTC (rev 919976)
@@ -11,7 +11,7 @@
  dotnet-targeting-pack-3.1
  aspnet-targeting-pack-3.1
 )
-pkgver=3.1.13.sdk113
+pkgver=3.1.14.sdk114
 pkgrel=1
 arch=(x86_64)
 url=https://www.microsoft.com/net/core
@@ -21,7 +21,7 @@
   clang
   cmake
   curl
-  dotnet-host
+  #dotnet-sdk-3.1
   git
   icu
   inetutils
@@ -38,9 +38,10 @@
   zlib
 )
 options=(staticlibs)
-_tag=e05eaa16dac3cad187cee7a8d883bd58d8690cb5
+_tag=3d8766be5c1b90273c047e134868c224df66b047
 source=(
   dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
+  dotnet-source-build-coreclr-tools-path.patch
   9999-coreclr-libicu-68.patch
   9999-corefx-add-arch-rids.patch
   9999-corefx-fix-build-clang10.patch
@@ -47,11 +48,28 @@
   9999-core-setup-fix-computed-rid.patch
 )
 b2sums=('SKIP'
+        'bd6bba84f851ce25b8dda085af1415acc14e50c6c99712dc03d51cdb3dbb362e7dc0ee16d54b27a1d46eb0db03be5dd0c1dae6c2a8a9ab0e46b2bf6c76292989'
         '85dbfde59de36b7632448a221a176a98804e3c5de65057de4aac0c93b5b37fe8f382eedcd8df143fceb8c5a38c2cb12173b354e2fb3ea1010aba4783a8959cf5'
         '2e56d6458c50c95e5d2489235b13727c8d708162318cad1cc05b225d47d736dbd9bc897eb3eb7014f716423dcfef67178efbdee41be30e64bac120912efeabd4'
         '6d0945602c351bab8b7c8555ce0bf0d72ee465e5807c444b10d24e00376d40ba84b5f1fd5adc4f06966a711e1d405a9c6dc3d988a19fd3baabefcb45277afb2a'
         'bd9e0cec11937997df2764bccfdb9468af8ffabd85597447a3de52c801cd6c2717fb297f4bad00784568c67b4f1648038cc0ffdccc7f52c63935562bc2f2ef9a')
 
+prepare() {
+  #cp -r /usr/share/dotnet .
+
+  cd dotnet-source-build
+
+  patch -Np1 -i ../dotnet-source-build-coreclr-tools-path.patch
+
+  [ -d patches/coreclr ] || mkdir patches/coreclr
+  cp ../9999-coreclr-libicu-68.patch patches/coreclr/
+  [ -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
 
@@ -65,18 +83,6 @@
   echo "${_runtimever}.sdk${_sdkver##*.}"
 }
 
-prepare() {
-  cd dotnet-source-build
-
-  [ -d patches/coreclr ] || mkdir patches/coreclr
-  cp ../9999-coreclr-libicu-68.patch patches/coreclr/
-  [ -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/
-}
-
 build() {
   cd dotnet-source-build
 
@@ -89,6 +95,7 @@
     /p:SkipPrebuiltEnforcement=true \
     /p:UseSystemLibraries=true \
     /p:UseSystemLibunwind=true
+    #--with-sdk "${srcdir}"/dotnet \
 }
 
 package_dotnet-runtime-3.1() {

Added: dotnet-source-build-coreclr-tools-path.patch
===================================================================
--- dotnet-source-build-coreclr-tools-path.patch	                        (rev 0)
+++ dotnet-source-build-coreclr-tools-path.patch	2021-04-19 11:50:08 UTC (rev 919976)
@@ -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>
+