mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-05-08 21:54:32 +02:00
testing/dotnet6-build: fix build with llvm19
This commit is contained in:
Antoine Martin
omni
parent
757097470f
commit
ef241bf28b
2 changed files with 69 additions and 5 deletions
testing/dotnet6-build
|
|
@ -2,13 +2,12 @@
|
|||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=dotnet6-build
|
||||
pkgver=6.0.135
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
# remember to upgrade dotnet6-runtime $_bldver when upgrading dotnet6-build
|
||||
_gittag=v$pkgver
|
||||
_giturl="https://github.com/dotnet/installer"
|
||||
_testtag=4f2372af276898d8acbe92d77af30da86920bbce
|
||||
_bunnytag=v15
|
||||
_llvmver=18
|
||||
_patches="
|
||||
build_14816-non-portable-build.patch
|
||||
build_14816-update-portable-rid-logic.patch
|
||||
|
|
@ -21,6 +20,7 @@ _patches="
|
|||
runtime_82269-mono-thread-coop-undefine-fortify-source.patch
|
||||
runtime_enable-system-libunwind.diff
|
||||
runtime_remove-usage-of-off64-t.patch
|
||||
runtime_clang-19.patch
|
||||
sdk_14239-add-zsh-compdef-completion-script.patch
|
||||
sdk_telemetry-optout.patch
|
||||
"
|
||||
|
|
@ -53,7 +53,7 @@ checkdepends="
|
|||
makedepends="
|
||||
alpine-release
|
||||
bash
|
||||
clang$_llvmver
|
||||
clang
|
||||
cmake
|
||||
dotnet$_pkgver_name-bootstrap
|
||||
dotnet$_pkgver_name-bootstrap-artifacts
|
||||
|
|
@ -73,11 +73,12 @@ makedepends="
|
|||
libxml2-utils
|
||||
linux-headers
|
||||
lldb-dev
|
||||
llvm$_llvmver-dev
|
||||
llvm-dev
|
||||
lttng-ust-dev
|
||||
nodejs
|
||||
numactl-dev
|
||||
openssl-dev
|
||||
patchelf
|
||||
pigz
|
||||
rsync
|
||||
tar
|
||||
|
|
@ -309,7 +310,7 @@ build() {
|
|||
msg "Building $pkgname-$pkgver"
|
||||
ulimit -n 4096
|
||||
|
||||
export PATH="$PATH:/usr/lib/llvm$_llvmver/bin"
|
||||
export PATH="$PATH:/usr/lib/llvm/bin"
|
||||
|
||||
# Disable use of LTTng as tracing on lttng <=2,13,0 is broken
|
||||
# See https://github.com/dotnet/runtime/issues/57784.
|
||||
|
|
@ -452,6 +453,12 @@ package() {
|
|||
|
||||
# some files either should or should not have executable bits
|
||||
_fix_executable "$pkgdir"
|
||||
|
||||
# make absolute rpath of libmscordbi.so to help abuild find libmscordaccore.so
|
||||
local _libmscordbi_path="$(realpath "$pkgdir"/usr/lib/dotnet/bootstrap/*/shared/Microsoft.NETCore.App/*/libmscordbi.so)"
|
||||
local _libmscordbi_path="${_libmscordbi_path/$pkgdir/}"
|
||||
local _libmscordbi_path="${_libmscordbi_path%/*}"
|
||||
patchelf $pkgdir/usr/lib/dotnet/bootstrap/*/shared/Microsoft.NETCore.App/*/libmscordbi.so --set-rpath $_libmscordbi_path
|
||||
}
|
||||
|
||||
sdk() {
|
||||
|
|
@ -590,6 +597,7 @@ e67e0114bd324dae65eb19f6fa8c74414bee77cd30e299931b0d82b4ca1b6b6f88358a0c47ffb180
|
|||
827e899a83103f666dc3d57c1ec695bebc659a574f4a1d754da0cafe8c18d7db79c3950267e905fa078f94612ee1101fbddd0ea62b3c08947d8bcd7d9c8de41c runtime_82269-mono-thread-coop-undefine-fortify-source.patch
|
||||
91f237afe642d0170dbf0e9a2706a4145c937d9d869d22959acaf092f1fd11941144b2b1d041102abe7b70349dd5869d558896e9d13d01f176cace39b21ef1ef runtime_enable-system-libunwind.diff
|
||||
d972e77df27748a80c9b23eca12f9fbd78be97f9034b79cc5703ba58eb6750171d9a115314300f883620ccbca89c65a99ca7a45d54a421b028b590190b4bed80 runtime_remove-usage-of-off64-t.patch
|
||||
2976799c63ff44e82646b1d77b211da918eea283e22f3ac6d30c889ba437fcae04a1fe92268a8d4d2fa89d2c0f6c6b2d4f166cfee684f8c6ae031e9d2707fdaf runtime_clang-19.patch
|
||||
d1b4ebcbb1a6815fc0ce4c471485c232618e60968a879309fb8336821a9351d2e0028d9f7726c0c041c750b497a0baa47400c78c9ceff550b91b4a6c2816fc41 sdk_14239-add-zsh-compdef-completion-script.patch
|
||||
815de1dad37412579b16d763debe2ecceffb44f5c46bd3f4ac00b3e431b20c677db435794eac41cea5601030b4e0f03f19e2d53c7a1ead896de2ffbca787eb84 sdk_telemetry-optout.patch
|
||||
"
|
||||
|
|
|
|||
56
testing/dotnet6-build/runtime_clang-19.patch
Normal file
56
testing/dotnet6-build/runtime_clang-19.patch
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
commit e356f564bf74909e77d000e3ad1b8b43c30d070c (HEAD -> release/8.0)
|
||||
Author: Omair Majid <omajid@redhat.com>
|
||||
Date: Tue Oct 15 14:53:33 2024 -0400
|
||||
|
||||
Fix clang19 build (#105141)
|
||||
|
||||
diff --git a/src/runtime/src/coreclr/vm/comreflectioncache.hpp b/src/runtime/src/coreclr/vm/comreflectioncache.hpp
|
||||
index 08d173e6164..12db55251d8 100644
|
||||
--- a/src/runtime/src/coreclr/vm/comreflectioncache.hpp
|
||||
+++ b/src/runtime/src/coreclr/vm/comreflectioncache.hpp
|
||||
@@ -26,6 +26,7 @@ public:
|
||||
|
||||
void Init();
|
||||
|
||||
+#ifndef DACCESS_COMPILE
|
||||
BOOL GetFromCache(Element *pElement, CacheType& rv)
|
||||
{
|
||||
CONTRACTL
|
||||
@@ -102,6 +103,7 @@ public:
|
||||
AdjustStamp(TRUE);
|
||||
this->LeaveWrite();
|
||||
}
|
||||
+#endif // !DACCESS_COMPILE
|
||||
|
||||
private:
|
||||
// Lock must have been taken before calling this.
|
||||
@@ -141,6 +143,7 @@ private:
|
||||
return CacheSize;
|
||||
}
|
||||
|
||||
+#ifndef DACCESS_COMPILE
|
||||
void AdjustStamp(BOOL hasWriterLock)
|
||||
{
|
||||
CONTRACTL
|
||||
@@ -170,6 +173,7 @@ private:
|
||||
if (!hasWriterLock)
|
||||
this->LeaveWrite();
|
||||
}
|
||||
+#endif // !DACCESS_COMPILE
|
||||
|
||||
void UpdateHashTable(SIZE_T hash, int slot)
|
||||
{
|
||||
diff --git a/src/runtime/src/libraries/Native/Unix/CMakeLists.txt.orig b/src/runtime/src/libraries/Native/Unix/CMakeLists.txt
|
||||
index e9ebefcf824..7f27c0bc105 100644
|
||||
--- a/src/runtime/src/libraries/Native/Unix/CMakeLists.txt.orig
|
||||
+++ b/src/runtime/src/libraries/Native/Unix/CMakeLists.txt
|
||||
@@ -35,6 +35,9 @@ add_compile_options(-Wno-empty-translation-unit)
|
||||
add_compile_options(-Wno-cast-align)
|
||||
add_compile_options(-Wno-typedef-redefinition)
|
||||
add_compile_options(-Wno-c11-extensions)
|
||||
+add_compile_options(-Wno-pre-c11-compat) # fixes build on Debian
|
||||
+add_compile_options(-Wno-unknown-warning-option) # unknown warning option '-Wno-pre-c11-compat'
|
||||
+add_compile_options(-Wno-switch-default)
|
||||
add_compile_options(-Wno-unknown-pragmas)
|
||||
add_compile_options(-Wno-unknown-warning-option)
|
||||
add_compile_options(-Wno-unused-but-set-variable)
|
||||
Loading…
Add table
Add a link
Reference in a new issue