From cce7e1fd99e4015a6c79ea85153b28472ce4e9ee Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 7 Sep 2021 17:55:33 -0400 Subject: [PATCH] dotnet-sdk: add missing deps and patch to make linker happy --- .../files/9999-runtime-link-order.patch | 23 +++++++++++++++++++ srcpkgs/dotnet-sdk/template | 12 ++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/dotnet-sdk/files/9999-runtime-link-order.patch diff --git a/srcpkgs/dotnet-sdk/files/9999-runtime-link-order.patch b/srcpkgs/dotnet-sdk/files/9999-runtime-link-order.patch new file mode 100644 index 00000000000000..c814f99e63f7f0 --- /dev/null +++ b/srcpkgs/dotnet-sdk/files/9999-runtime-link-order.patch @@ -0,0 +1,23 @@ +diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/installer/corehost/cli/apphost/static/CMakeLists.txt +index a9d5b04..653b356 100644 +--- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt ++++ b/src/installer/corehost/cli/apphost/static/CMakeLists.txt +@@ -212,14 +212,14 @@ 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} + ) + + if(NOT FEATURE_DISTRO_AGNOSTIC_SSL) diff --git a/srcpkgs/dotnet-sdk/template b/srcpkgs/dotnet-sdk/template index 3f6e821fc67167..b734594b1be191 100644 --- a/srcpkgs/dotnet-sdk/template +++ b/srcpkgs/dotnet-sdk/template @@ -1,16 +1,16 @@ # Template file for 'dotnet-sdk' pkgname=dotnet-sdk -version=5.0.202 +version=5.0.206.1 revision=1 wrksrc="source-build-${version}-SDK" -hostmakedepends="git tar wget" -makedepends="icu-devel" +hostmakedepends="git tar wget python3 cmake clang llvm" +makedepends="icu-devel libunwind-devel lttng-ust-devel zlib-devel mit-krb5-devel" short_desc="SDK for making dotnet CORE apps" maintainer="KawaiiAmber " license="MIT" homepage="https://dotnet.microsoft.com" distfiles="https://github.com/dotnet/source-build/archive/refs/tags/v${version}-SDK.tar.gz" -checksum=aea8e4f3323aa95316969958585ccc7030f9be7c79d38188a9137ef789ada7cd +checksum=e531ac5ea818b0c10e945922ee761a0a33ec2389fa112721ea3e1c405461a0de _prof=${DESTDIR}/etc/profile.d _target=${DESTDIR}/usr/libexec/dotnet @@ -22,8 +22,10 @@ esac _RUNTIME_ID="void-${_ARCHITECTURE}" do_configure() { + cp "${FILESDIR}"/9999-runtime-link-order.patch patches/runtime/ + vmkdir ${_prof} - vcopy ${FILESDIR}/dotnet.sh ${_prof} + vcopy "${FILESDIR}"/dotnet.sh "${_prof}" } do_build() {