clang, llvm: merge packages and drop llvm-huge repo

17 files changed, 6 insertions, 72 deletions

diff --git a/alternatives/llvm-huge/README.md b/alternatives/llvm-huge/README.md
deleted file mode 100644
index 9696d82e..00000000
--- a/alternatives/llvm-huge/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-llvm-huge
-=========
-
-This alternative repository provides a "huge" version of LLVM. This build
-includes Clang, LLD, and all targets are enabled. You do not need this in most
-cases, so it's provided as an alternative package. If you're using this package
-you don't need to install the `clang` package
diff --git a/alternatives/llvm-huge/llvm/build b/alternatives/llvm-huge/llvm/build
deleted file mode 100755
index f57f3451..00000000
--- a/alternatives/llvm-huge/llvm/build
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-export DESTDIR="$1"
-
-cmake -S llvm -B build \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLIBCXX_HAS_MUSL_LIBC=YES \
-    -DLLVM_BUILD_LLVM_DYLIB=ON \
-    -DLLVM_LINK_LLVM_DYLIB=ON \
-    -DLLVM_ENABLE_PROJECTS="clang;lld" \
-    -DLLVM_ENABLE_RTTI=ON \
-    -DLLVM_BUILD_EXAMPLES=OFF \
-    -DLLVM_BUILD_DOCS=OFF \
-    -DLLVM_BUILD_TESTS=OFF \
-    -Wno-dev
-
-cmake --build   build
-cmake --install build
diff --git a/alternatives/llvm-huge/llvm/checksums b/alternatives/llvm-huge/llvm/checksums
deleted file mode 100644
index 64253619..00000000
--- a/alternatives/llvm-huge/llvm/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-e17d3fc1b86285ccafca462c884b319de15dc6cd938376aed79b077a060279c0  llvm-project-15.0.6.src.tar.xz
diff --git a/alternatives/llvm-huge/llvm/depends b/alternatives/llvm-huge/llvm/depends
deleted file mode 100644
index 126422ec..00000000
--- a/alternatives/llvm-huge/llvm/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake  make
-python make
-zlib
diff --git a/alternatives/llvm-huge/llvm/meta b/alternatives/llvm-huge/llvm/meta
deleted file mode 100644
index 26ff2b56..00000000
--- a/alternatives/llvm-huge/llvm/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Low Level Virtual Machine
-license: Apache-2.0
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/alternatives/llvm-huge/llvm/sources b/alternatives/llvm-huge/llvm/sources
deleted file mode 100644
index 63116538..00000000
--- a/alternatives/llvm-huge/llvm/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz
diff --git a/alternatives/llvm-huge/llvm/version b/alternatives/llvm-huge/llvm/version
deleted file mode 100644
index 05e06c48..00000000
--- a/alternatives/llvm-huge/llvm/version
+++ /dev/null
@@ -1 +0,0 @@
-15.0.6 1
diff --git a/extra/clang/build b/extra/clang/build
deleted file mode 100755
index 1b10de93..00000000
--- a/extra/clang/build
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-export DESTDIR="$1"
-
-mv Modules/*.cmake cmake/modules
-
-cmake -B build \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLLVM_ENABLE_RTTI=ON \
-    -DLLVM_ENABLE_EH=ON \
-    -DCLANG_BUILD_EXAMPLES=OFF \
-    -DCLANG_INCLUDE_DOCS=OFF \
-    -DCLANG_INCLUDE_TESTS=OFF \
-    -DLIBCLANG_BUILD_STATIC=ON \
-    -Wno-dev
-
-cmake --build   build
-cmake --install build
diff --git a/extra/clang/checksums b/extra/clang/checksums
deleted file mode 100644
index 99b63a73..00000000
--- a/extra/clang/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-5827bd572ad46c568c2efa39325a78f48318cf073006e659c7d7dd7a7452f97f  clang-14.0.6.src.tar.xz
diff --git a/extra/clang/depends b/extra/clang/depends
deleted file mode 100644
index 7a0f0b0e..00000000
--- a/extra/clang/depends
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake  make
-llvm
-python make
-xz
-zlib
diff --git a/extra/clang/meta b/extra/clang/meta
deleted file mode 100644
index 2ee77733..00000000
--- a/extra/clang/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: LLVM C/C++ compiler frontend
-license: Apache-2.0
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/clang/sources b/extra/clang/sources
deleted file mode 100644
index 6520bf9c..00000000
--- a/extra/clang/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/clang-14.0.6.src.tar.xz
diff --git a/extra/clang/version b/extra/clang/version
deleted file mode 100644
index 4de48ee7..00000000
--- a/extra/clang/version
+++ /dev/null
@@ -1 +0,0 @@
-14.0.6 1
diff --git a/extra/llvm/build b/extra/llvm/build
index 337ebeb3..f8b0f3b0 100755
--- a/extra/llvm/build
+++ b/extra/llvm/build
@@ -2,12 +2,13 @@
 
 export DESTDIR="$1"
 
-cmake -B build \
+cmake -S llvm -B build \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
+    -DLIBCXX_HAS_MUSL_LIBC=YES \
     -DLLVM_BUILD_LLVM_DYLIB=ON \
     -DLLVM_LINK_LLVM_DYLIB=ON \
-    -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
+    -DLLVM_ENABLE_PROJECTS="clang;lld" \
     -DLLVM_ENABLE_RTTI=ON \
     -DLLVM_HOST_TRIPLE="$(cc -dumpmachine)" \
     -DLLVM_BUILD_EXAMPLES=OFF \
diff --git a/extra/llvm/checksums b/extra/llvm/checksums
index c5486195..64253619 100644
--- a/extra/llvm/checksums
+++ b/extra/llvm/checksums
@@ -1,2 +1,2 @@
 %BLAKE3
-eaea9dd005624c156edc0cfb02b73a28d4a7aa44cd08bac49ce2c6d5a1f4ca4e  llvm-14.0.6.src.tar.xz
+e17d3fc1b86285ccafca462c884b319de15dc6cd938376aed79b077a060279c0  llvm-project-15.0.6.src.tar.xz
diff --git a/extra/llvm/sources b/extra/llvm/sources
index 7ba7de73..63116538 100644
--- a/extra/llvm/sources
+++ b/extra/llvm/sources
@@ -1 +1 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-14.0.6.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz
diff --git a/extra/llvm/version b/extra/llvm/version
index 4de48ee7..05e06c48 100644
--- a/extra/llvm/version
+++ b/extra/llvm/version
@@ -1 +1 @@
-14.0.6 1
+15.0.6 1