[arch-commits] Commit in dotnet-core/trunk (5 files)
Maxime Gauduin
alucryd at archlinux.org
Wed Mar 17 06:59:12 UTC 2021
Date: Wednesday, March 17, 2021 @ 06:59:12
Author: alucryd
Revision: 893044
upgpkg: dotnet-core 5.0.4.sdk104-1
Added:
dotnet-core/trunk/9999-runtime-link-order.patch
Modified:
dotnet-core/trunk/PKGBUILD
Deleted:
dotnet-core/trunk/0000-runtime-link-order.patch
dotnet-core/trunk/dotnet-source-build-arch-rid.patch
dotnet-core/trunk/dotnet-source-build-fixup-runtime-link-order.patch
----------------------------------------------------+
0000-runtime-link-order.patch | 20 ------------------
9999-runtime-link-order.patch | 20 ++++++++++++++++++
PKGBUILD | 21 ++++++-------------
dotnet-source-build-arch-rid.patch | 11 ---------
dotnet-source-build-fixup-runtime-link-order.patch | 14 ------------
5 files changed, 27 insertions(+), 59 deletions(-)
Deleted: 0000-runtime-link-order.patch
===================================================================
--- 0000-runtime-link-order.patch 2021-03-17 06:58:47 UTC (rev 893043)
+++ 0000-runtime-link-order.patch 2021-03-17 06:59:12 UTC (rev 893044)
@@ -1,20 +0,0 @@
---- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt
-+++ b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
-@@ -204,11 +204,12 @@ target_link_libraries(singlefilehost
- libhostcommon
- ${CORECLR_LIBRARIES}
-
-- ${ZLIB_LIBRARIES}
-- ${LIBGSS}
-- ${NATIVE_LIBS_EXTRA}
--
- ${START_WHOLE_ARCHIVE}
- ${NATIVE_LIBS}
- ${END_WHOLE_ARCHIVE}
-+
-+ ${ZLIB_LIBRARIES}
-+ ${LIBGSS}
-+ ${NATIVE_LIBS_EXTRA}
-+
- )
-
Added: 9999-runtime-link-order.patch
===================================================================
--- 9999-runtime-link-order.patch (rev 0)
+++ 9999-runtime-link-order.patch 2021-03-17 06:59:12 UTC (rev 893044)
@@ -0,0 +1,20 @@
+--- runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1.orig/src/installer/corehost/cli/apphost/static/CMakeLists.txt 2021-03-16 15:05:11.692543567 +0000
++++ runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1/src/installer/corehost/cli/apphost/static/CMakeLists.txt 2021-03-16 15:06:51.581738910 +0000
+@@ -207,12 +207,12 @@ target_link_libraries(
+ libhostcommon
+ ${CORECLR_LIBRARIES}
+
+- ${ZLIB_LIBRARIES}
+- ${LIBGSS}
+- ${NATIVE_LIBS_EXTRA}
+-
+ ${START_WHOLE_ARCHIVE}
+ ${RUNTIMEINFO_LIB}
+ ${NATIVE_LIBS}
+ ${END_WHOLE_ARCHIVE}
++
++ ${ZLIB_LIBRARIES}
++ ${LIBGSS}
++ ${NATIVE_LIBS_EXTRA}
+ )
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-17 06:58:47 UTC (rev 893043)
+++ PKGBUILD 2021-03-17 06:59:12 UTC (rev 893044)
@@ -13,8 +13,8 @@
dotnet-targeting-pack
aspnet-targeting-pack
)
-pkgver=5.0.3.sdk103
-pkgrel=2
+pkgver=5.0.4.sdk104
+pkgrel=1
arch=(x86_64)
url=https://www.microsoft.com/net/core
license=(MIT)
@@ -38,19 +38,15 @@
zlib
)
options=(staticlibs)
-_tag=ccff33e9e87656ab8349dba6779363b15d53d56a
+_tag=269e323b5f2e2df4678c7763282c14fb1a530cfa
source=(
dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
- dotnet-source-build-arch-rid.patch
- dotnet-source-build-fixup-runtime-link-order.patch
- 0000-runtime-link-order.patch
9999-runtime-libicu-68.patch
+ 9999-runtime-link-order.patch
)
b2sums=('SKIP'
- '74c0e764fd22843fb64dad09d7678988980ed8fc39b9aef53d210ba60991b686a5e43a69a497fdaa9d97447144f22e328606a8b25cb6d3addab586e6e67de43b'
- '8dcfe6ca1a5168b7fb7519903a3d1f16a0584ba7a86bd1e3ca1bdb21b34fe22afb115e3d97ccaf186d2edec346e3948c192e61e40fd1774e46f6eea2e82e87be'
- 'f338e7e971db82ee7699e36842e70c0e476af78cd18ed52a2a9d9bafa2c4d0b410565a9dae571ff89a9383fdaa5814c18d11e230a86c21606c2f31fec101d840'
- '5e60cccee68ff6b5fa64a37364da099592890eda734472ed55e356718388ea0880a5558e1b3c1904208187207daf314c4abfdcf3a11985415e9a494aa04d1ddf')
+ '5e60cccee68ff6b5fa64a37364da099592890eda734472ed55e356718388ea0880a5558e1b3c1904208187207daf314c4abfdcf3a11985415e9a494aa04d1ddf'
+ '437e0b0956576795087f9e5299f6b847aaaef8158847a269d34331d42da6729721d121eed82b95e4833f9d01322da677d85db924bf43140360c5592d51324565')
pkgver() {
cd dotnet-source-build
@@ -68,12 +64,9 @@
prepare() {
cd dotnet-source-build
- patch -Np1 -i ../dotnet-source-build-arch-rid.patch
- patch -Np1 -i ../dotnet-source-build-fixup-runtime-link-order.patch
-
[ -d patches/runtime ] || mkdir patches/runtime
- cp ../0000-runtime-link-order.patch patches/runtime/
cp ../9999-runtime-libicu-68.patch patches/runtime/
+ cp ../9999-runtime-link-order.patch patches/runtime/
# disable warnings
sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
Deleted: dotnet-source-build-arch-rid.patch
===================================================================
--- dotnet-source-build-arch-rid.patch 2021-03-17 06:58:47 UTC (rev 893043)
+++ dotnet-source-build-arch-rid.patch 2021-03-17 06:59:12 UTC (rev 893044)
@@ -1,11 +0,0 @@
---- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs
-+++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs
-@@ -46,6 +46,7 @@ namespace Microsoft.DotNet.Build.Tasks
- ".fedora.32", "-fedora.32",
- ".fedora.33", "-fedora.33",
- ".fedora.34", "-fedora.34",
-+ "-arch",".arch",
- "-linux", ".linux",
- "-osx", ".osx",
- "-OSX", ".OSX",
-
Deleted: dotnet-source-build-fixup-runtime-link-order.patch
===================================================================
--- dotnet-source-build-fixup-runtime-link-order.patch 2021-03-17 06:58:47 UTC (rev 893043)
+++ dotnet-source-build-fixup-runtime-link-order.patch 2021-03-17 06:59:12 UTC (rev 893044)
@@ -1,14 +0,0 @@
---- a/patches/runtime/0014-Fix-singlefilehost-build-in-non-portable-mode-42415.patch
-+++ b/patches/runtime/0014-Fix-singlefilehost-build-in-non-portable-mode-42415.patch
-@@ -45,8 +45,8 @@ index 85ea6ffe642..87db505c521 100644
- # These options are used to force every object to be included even if it's unused.
- set(START_WHOLE_ARCHIVE -Wl,--whole-archive)
- @@ -212,3 +217,10 @@ target_link_libraries(singlefilehost
-- ${NATIVE_LIBS}
-- ${END_WHOLE_ARCHIVE}
-+ ${NATIVE_LIBS_EXTRA}
-+
- )
- +
- +if(NOT FEATURE_DISTRO_AGNOSTIC_SSL)
-
More information about the arch-commits
mailing list