SOURCE_HASH=sha256:050922ecaaca5781fdf6631ea92bc715183f202f9d2f15147226f023414f619a
@@ -16,11 +15,6 @@ if [[ "$LLVM_WITH_CLANG" == y ]]; then
SOURCE9_URL[0]="${GITHUB_URI}/${SOURCE9}"
SOURCE9_HASH=sha256:7cf3b8ff56c65c4d1eae3c56883fc4a6cbc3ff9f3a1530a74d66e45d27271866
fi
-if [[ "$LLVM_WITH_LLDB" == y ]]; then
- SOURCE7="lldb-${VERSION}.src.tar.xz"
- SOURCE7_URL[0]="${GITHUB_URI}/${SOURCE7}"
- SOURCE7_HASH=sha256:
-fi
if [[ "$LLVM_WITH_POLLY" == y ]]; then
SOURCE11="polly-${VERSION}.src.tar.xz"
SOURCE11_URL[0]="${GITHUB_URI}/${SOURCE11}"
@@ -40,7 +34,7 @@ if [[ "$LLVM_WITH_LLD" == y ]]; then
SOURCE19_URL[0]="${GITHUB_URI}/${SOURCE19}"
SOURCE19_HASH=sha256:82fbe9033da986f6ff3092a9df31049b4b19cbe59a46c6ab54e0523b31550794
fi
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}.src"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tar.xz}"
WEB_SITE="https://llvm.org"
LICENSE[0]=BSD
ENTERED=20230330
diff --git a/devel/llvm14/HISTORY b/devel/llvm14/HISTORY
index 76097e0..3b440e8 100644
--- a/devel/llvm14/HISTORY
+++ b/devel/llvm14/HISTORY
@@ -1,6 +1,9 @@
2023-03-30 Conner Clere <xenanthropy AT sourcemage.org>
- * BUILD, CONFIGURE, DEPENDS, INSTALL, DETAILS: new spell, version
14.0.6
- * PRE_BUILD, PREPARE, PRE_SUB_DEPENDS, SUB_DEPENDS: added
- * patches-clang/*, patches-libcxx/*, patches-lldb/*, patches-llvm/*:
added
- * 0001-Include-libunwind-from-source-directory.patch: added
+ * BUILD, CONFIGURE, DEPENDS, INSTALL, DETAILS, PRE_BUILD, PREPARE,
+ PRE_SUB_DEPENDS, SUB_DEPENDS,
+ patches-clang/clang-001-fix-unwind-chain-inclusion.patch,
+ patches-lld/0001-Include-libunwind-from-source-directory.patch,
+ patches-lld/{libcxxabi-dl,libcxx-musl}.patch,
+ patches-llvm/llvm-0001-musl.patch: new spell, version 14.0.6,
+ based on the llvm spell
-if [[ "$LLVM_WITH_LLDB" == y ]]; then
- unpack_file 7 &&
- mv lldb-${VERSION}.src tools/lldb &&
- apply_patch_dir patches-lldb
-fi &&
-
if [[ "$LLVM_WITH_POLLY" == y ]]; then
unpack_file 11 &&
mv polly-${VERSION}.src tools/polly
@@ -33,13 +27,8 @@ if [[ "$LLVM_WITH_LLD" == y ]]; then
mv libcxx-${VERSION}.src runtimes/libcxx &&
unpack_file 19 &&
mv libcxxabi-${VERSION}.src runtimes/libcxxabi &&
- apply_patch_dir patches-libcxx &&
- # Bugfix for llvm 12.0.0, cf. https://groups.google.com/g/llvm-dev/c/gIY5COm6V5E
- # This will probably be fixed in llvm 12.0.1.
- # As of 2021-07-10 this has not been fixed.
- cd "$SOURCE_DIRECTORY/tools" &&
- patch -p1 <
"$SPELL_DIRECTORY/0001-Include-libunwind-from-source-directory.patch"
+ apply_patch_dir patches-lld
fi &&