[arch-commits] Commit in dotnet-core/trunk (9999-Fix-build-clang-10.patch PKGBUILD)

[Maxime Gauduin]

    Date: Monday, July 27, 2020 @ 19:56:02
  Author: alucryd
Revision: 665522

upgpkg: dotnet-core 3.1.6.sdk106-1

Added:
  dotnet-core/trunk/9999-Fix-build-clang-10.patch
Modified:
  dotnet-core/trunk/PKGBUILD

-------------------------------+
 9999-Fix-build-clang-10.patch |   13 +++++++++++++
 PKGBUILD                      |   23 ++++++++++++++---------
 2 files changed, 27 insertions(+), 9 deletions(-)

Added: 9999-Fix-build-clang-10.patch
===================================================================
--- 9999-Fix-build-clang-10.patch	                        (rev 0)
+++ 9999-Fix-build-clang-10.patch	2020-07-27 19:56:02 UTC (rev 665522)
@@ -0,0 +1,13 @@
+diff -rupN corefx.620cea9ccf0359993e803c900059932966399584.orig/src/Native/Unix/CMakeLists.txt corefx.620cea9ccf0359993e803c900059932966399584/src/Native/Unix/CMakeLists.txt
+--- corefx.620cea9ccf0359993e803c900059932966399584.orig/src/Native/Unix/CMakeLists.txt	2020-06-23 18:07:14.111464986 +0200
++++ corefx.620cea9ccf0359993e803c900059932966399584/src/Native/Unix/CMakeLists.txt	2020-06-23 18:08:56.147153789 +0200
+@@ -18,6 +18,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(-fPIC)
+ add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
+ add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-27 19:47:45 UTC (rev 665521)
+++ PKGBUILD	2020-07-27 19:56:02 UTC (rev 665522)
@@ -9,14 +9,15 @@
  dotnet-sdk
  aspnet-runtime
 )
-pkgver=3.1.3.sdk103.2
-_runtimever=3.1.3
-_sdkver=3.1.103
+pkgver=3.1.6.sdk106
+_runtimever=3.1.6
+_sdkver=3.1.106
 pkgrel=1
 arch=(x86_64)
 url=https://www.microsoft.com/net/core
 license=(MIT)
 makedepends=(
+  bash
   clang
   cmake
   curl
@@ -33,14 +34,17 @@
   zlib
 )
 options=(staticlibs)
+_tag=bebae309898f714f8d3e79f1b86cb3d086487af0
 source=(
-  dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=ed88943d2414b1abaaae657b5b3c2d38a1391164
+  dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
   9999-Fix-versionless-RID-computation.patch
   9999-Add-arch-RIDs.patch
+  9999-Fix-build-clang-10.patch
 )
 sha256sums=('SKIP'
             '0e500cd3d1e4a75bf58558020f1b6ad7720f9194dfea2aade7c148af5a031cd7'
-            '1d64778c9ac6a5aa49cda743e87ed31ace6aef8aa2e22f98ccd9bb7303cfd593')
+            '1d64778c9ac6a5aa49cda743e87ed31ace6aef8aa2e22f98ccd9bb7303cfd593'
+            '9eb32eb8a7baa0dfc3d68fa7f6c316fcd14ccd9075177a5d3c8a044edb2a07c2')
 
 prepare() {
   cd dotnet-source-build
@@ -47,6 +51,7 @@
 
   cp ../9999-Fix-versionless-RID-computation.patch patches/core-setup/
   cp ../9999-Add-arch-RIDs.patch patches/corefx/
+  cp ../9999-Fix-build-clang-10.patch patches/corefx/
 }
 
 build() {
@@ -61,7 +66,7 @@
   pkgdesc='A generic driver for the .NET Core Command Line Interface'
   depends=(glibc)
 
-  cd dotnet-source-build/bin/x64/Release
+  cd dotnet-source-build/artifacts/x64/Release
 
   install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{dotnet,licenses/dotnet-host}}
   bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner dotnet host
@@ -87,7 +92,7 @@
   provides=(dotnet-runtime-3.1)
   conflicts=(dotnet-runtime-3.1)
 
-  cd dotnet-source-build/bin/x64/Release
+  cd dotnet-source-build/artifacts/x64/Release
 
   install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
   bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.NETCore.App
@@ -103,7 +108,7 @@
   provides=(dotnet-sdk-3.1)
   conflicts=(dotnet-sdk-3.1)
 
-  cd dotnet-source-build/bin/x64/Release
+  cd dotnet-source-build/artifacts/x64/Release
 
   install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
   bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs sdk templates
@@ -116,7 +121,7 @@
   provides=(aspnet-runtime-3.1)
   conflicts=(aspnet-runtime-3.1)
 
-  cd dotnet-source-build/bin/x64/Release
+  cd dotnet-source-build/artifacts/x64/Release
 
   install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
   bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.AspNetCore.App