Maxime Gauduin pushed to branch main at Arch Linux / Packaging / Packages / dotnet-core-7.0
Commits: 6408841d by loqs at 2024-09-17T21:23:35+00:00 Update checksum of github hosted patch Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/dotnet-core-7.0/-/issues/2. - - - - - c6310bfd by loqs at 2024-09-17T23:54:11+01:00 Fix building with clang 18 Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/dotnet-core-7.0/-/issues/3. - - - - - 85b07662 by loqs at 2024-09-17T23:54:16+01:00 Remove inetutils from makedepends - - - - - 2 changed files: - PKGBUILD - + dotnet-core-7.0-clang-18.patch Changes: ===================================== PKGBUILD ===================================== @@ -25,7 +25,6 @@ makedepends=( dotnet-source-built-artifacts-7.0 git icu - inetutils krb5 libgit2 libunwind @@ -47,10 +46,12 @@ _tag=25b977658c06fd0217ec0bc0714398bb9d0a7bb0 source=( dotnet-installer::git+https://github.com/dotnet/installer.git#tag=${_tag} https://github.com/dotnet/runtime/commit/31e4f404c218eae7ba999c4df5346d30f971451c.patch + dotnet-core-7.0-clang-18.patch dotnet.sh ) b2sums=('92cd97e5d42b46247ee441f7f3d8858a7f484d39a5b82d8598d72ddb9d552e3e018f1eb80d6ad581a08567748e2af3b1d56b6895a5809a74b04fb80b5b3ac881' - '70b4b8f70ed66c7b6cd761856b830945e8d5e79bda12735a0544e5b662fdd2455245d881b2480e5fcb9a631be007db439a8ce73f4b1f2ada23999828d14c9d76' + '36e3dcba3be4d6c3a77cdb92287acaaae681078730d9e94dce3025e926b9691c4439a8b790ca4ece643b8162bdcd7d93d2a3860610841f0b282e8e21c0873446' + '1bbe5838d0ebe2f513cc5defaf1695822e6b8ce3f13a3b65e581579666c6723e1a8da792f5aa8933a1af5a665a6c9feefd95fe8c248e730d8751863907af522e' '4a64e3ee550e296bdde894f9202c6f372934cc29154f47d302599b4c368825a96a7b786faa6109a24a1101ff130fd9e4d0ccba094ec91e7f2ca645725bf71b34') prepare() { @@ -114,6 +115,8 @@ build() { sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' eng/SourceBuild.props # https://github.com/dotnet/runtime/issues/79196 patch -Np1 -i "${srcdir}"/31e4f404c218eae7ba999c4df5346d30f971451c.patch + # https://github.com/dotnet/runtime/commit/ab416e9ef39c6709b815e6ca31753a4c6e44ed58 + patch -Np1 -i "${srcdir}"/dotnet-core-7.0-clang-18.patch popd if [[ $_bootstrapver != $_previousver ]]; then ===================================== dotnet-core-7.0-clang-18.patch ===================================== @@ -0,0 +1,59 @@ +commit 2a942f5f58a77dd4350b1f46d63a0946d4fe2d51 +Author: Omair Majid <[email protected]> +Date: Wed Mar 27 15:53:19 2024 -0400 + + Support building against clang 18 (#100258) + + This is a targeted backport from a few other PRs that makes it possible + to build dotnet/runtme's 8.0 branch on Fedora 40 which includes clang + 18. + + - https://github.com/dotnet/arcade/pull/14572 + - https://github.com/dotnet/runtime/pull/94782 + - https://github.com/dotnet/runtime/pull/99811 + + (cherry picked from commit ab416e9ef39c6709b815e6ca31753a4c6e44ed58) + + Conflicts: + eng/common/native/init-compiler.sh + eng/native/configurecompiler.cmake + +diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh +index 81ea061512b..de93165b672 100644 +--- a/eng/common/native/init-compiler.sh ++++ b/eng/common/native/init-compiler.sh +@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then + # Set default versions + if [[ -z "$majorVersion" ]]; then + # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. +- if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) ++ if [[ "$compiler" == "clang" ]]; then versions=( 18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi + + for version in "${versions[@]}"; do +diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake +index b3238be0d8a..cfafeb758d3 100644 +--- a/eng/native/configurecompiler.cmake ++++ b/eng/native/configurecompiler.cmake +@@ -469,6 +469,9 @@ if (CLR_CMAKE_HOST_UNIX) + add_compile_options(-Wno-single-bit-bitfield-constant-conversion) + add_compile_options(-Wno-cast-function-type-strict) + add_compile_options(-Wno-incompatible-function-pointer-types-strict) ++ ++ # clang 18.1 supressions ++ add_compile_options(-Wno-switch-default) + else() + add_compile_options(-Wno-uninitialized) + add_compile_options(-Wno-strict-aliasing) +diff --git a/src/coreclr/pal/src/include/pal/palinternal.h b/src/coreclr/pal/src/include/pal/palinternal.h +index dc39af8f4d4..ce34c032cc6 100644 +--- a/src/coreclr/pal/src/include/pal/palinternal.h ++++ b/src/coreclr/pal/src/include/pal/palinternal.h +@@ -425,6 +425,7 @@ function_name() to call the system's implementation + #undef va_start + #undef va_end + #undef va_copy ++#undef va_arg + #undef stdin + #undef stdout + #undef stderr View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/dotnet-core-7.0/-/compare/102d7c15c52f668d6517a93180552d181dce8850...85b076629905816c1d5e7eebb21cf1eecff0cd24 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/dotnet-core-7.0/-/compare/102d7c15c52f668d6517a93180552d181dce8850...85b076629905816c1d5e7eebb21cf1eecff0cd24 You're receiving this email because of your account on gitlab.archlinux.org.
