Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (8aa2a983310badea2f0498a41eebe59fb75f1a4e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (8aa2a983310badea2f0498a41eebe59fb75f1a4e)
  • Date: Sun, 5 Jan 2025 02:05:41 +0000

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

devel/llvm/BUILD | 13 ++++++++-----
devel/llvm/HISTORY | 7 +++++++
devel/llvm/PRE_BUILD | 31 ++++++++++---------------------
devel/llvm/PRE_SUB_DEPENDS | 1 -
devel/llvm/SUB_DEPENDS | 4 ----
graphics-libs/mesa/DEPENDS | 2 +-
graphics-libs/mesa/HISTORY | 3 +++
7 files changed, 29 insertions(+), 32 deletions(-)

New commits:
commit 8aa2a983310badea2f0498a41eebe59fb75f1a4e
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

devel/llvm: simplify build process

The LLVM build process can use either symlinks in the correct
sub-directories, or having the same sub-projects specified in
corresponding LLVM_ENABLE_PROJECTS and LLVM_ENABLE_RUNTIMES CMake
variables. Use the CMake variables and avoid symlinking to simplify the
unpacking and build process, which leads to easier spell maintenance.

commit 23773a1044c90564af359ed9b78f325d9981bbf2
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

devel/llvm: remove unneeded sub-depends option

Support for generic target sub-dependencies was already added some time
ago, and currently the only spell that specifies the AMD target as an
llvm sub-dependency is mesa. With mesa updated to use TARGET-AMDGPU
instead of AMD, the AMD option is no longer needed so it has been
removed.

commit ba30706b8b77e040d35dd89466f98de15af098a7
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

graphics-libs/mesa: udpate llvm target sub-dep

Update the llvm target sub-dependency to use the general target name
TARGET-AMDGPU instead of the mesa-specific sub-dependency name AMD.

diff --git a/devel/llvm/BUILD b/devel/llvm/BUILD
index 5f42485..d91faab 100755
--- a/devel/llvm/BUILD
+++ b/devel/llvm/BUILD
@@ -34,39 +34,40 @@ else
OPTS="$OPTS -DLLVM_ENABLE_RTTI=OFF"
fi &&

-OPTS="$OPTS -DLLVM_TOOL_LIBCLC_BUILD=ON"
-
if [[ "$LLVM_WITH_BOLT" == y ]] ;then
+ LLVM_PROJECTS="$LLVM_PROJECTS bolt" &&
OPTS="$OPTS -DLLVM_TOOL_BOLT_BUILD=ON"
fi &&

if [[ "$LLVM_WITH_CLANG" == y ]] ;then
+ LLVM_PROJECTS="$LLVM_PROJECTS clang" &&
OPTS="$OPTS -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=ON" &&
OPTS="$OPTS -DCLANG_INCLUDE_BENCHMARKS=OFF" &&
OPTS="$OPTS -DCLANG_INCLUDE_TESTS=OFF"
fi &&

if [[ "$LLVM_WITH_LLD" == y ]] ;then
+ LLVM_PROJECTS="$LLVM_PROJECTS lld" &&
OPTS="$OPTS -DLLVM_TOOL_LLD_BUILD=ON"
fi &&

if [[ "$LLVM_WITH_LLDB" == y ]] ;then
+ LLVM_PROJECTS="$LLVM_PROJECTS lldb" &&
OPTS="$OPTS -DLLVM_TOOL_LLDB_BUILD=ON" &&
OPTS="$OPTS -DLLDB_INCLUDE_TESTS=OFF"
fi &&

if [[ "$LLVM_WITH_MLIR" == y ]] ;then
+ LLVM_PROJECTS="$LLVM_PROJECTS mlir" &&
OPTS="$OPTS -DLLVM_TOOL_MLIR_BUILD=ON" &&
OPTS="$OPTS -DMLIR_ENABLE_PYTHON_BENCHMARKS=OFF"
fi &&

if [[ "$LLVM_WITH_POLLY" == y ]] ;then
+ LLVM_PROJECTS="$LLVM_PROJECTS polly" &&
OPTS="$OPTS -DLLVM_TOOL_POLLY_BUILD=ON"
fi &&

-# enable requested runtimes
-OPTS="$OPTS -DLLVM_ENABLE_RUNTIMES=${LLVM_RUNTIMES// /;}" &&
-
if list_find "$LLVM_RUNTIMES" "compiler-rt" ;then
OPTS="$OPTS -DLLVM_TOOL_COMPILER_RT_BUILD=ON" &&
OPTS="$OPTS -DCOMPILER_RT_INCLUDE_TESTS=OFF"
@@ -91,4 +92,6 @@ if list_find "$LLVM_RUNTIMES" "openmp" ;then
OPTS="$OPTS -DLLVM_TOOL_OPENMP_BUILD=ON"
fi &&

+OPTS="$OPTS -DLLVM_ENABLE_PROJECTS=${LLVM_PROJECTS// /;}" &&
+OPTS="$OPTS -DLLVM_ENABLE_RUNTIMES=${LLVM_RUNTIMES// /;}" &&
cmake_build -S ../llvm
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 6fd8ef3..5591cce 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,4 +1,11 @@
2025-01-05 Jutsin Boffemmyer <flux AT sourcemage.org>
+ * BUILD,PRE_BUILD: simplify with CMake vars instead of symlinks
+ * PREPARE: clean up whitespace
+
+2025-01-05 Jutsin Boffemmyer <flux AT sourcemage.org>
+ * PRE_SUB_DEPENDS,SUB_DEPENDS: remove unneeded option
+
+2025-01-05 Jutsin Boffemmyer <flux AT sourcemage.org>
* BUILD: fix placement of &&

2025-01-05 Jutsin Boffemmyer <flux AT sourcemage.org>
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index bc9878c..9756450 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -9,14 +9,12 @@ mv cmake-${VERSION}.src cmake &&

if [[ "$LLVM_WITH_BOLT" == y ]]; then
unpack_file 5 &&
- mv bolt-${VERSION}.src bolt &&
- ln -s ../../bolt llvm/tools/bolt
+ mv bolt-${VERSION}.src bolt
fi &&

if [[ "$LLVM_WITH_CLANG" == y ]]; then
unpack_file 7 &&
mv clang-${VERSION}.src clang &&
- ln -s ../../clang llvm/tools/clang &&
unpack_file 9 &&
mv clang-tools-extra-${VERSION}.src clang-tools-extra &&
ln -s ../../clang-tools-extra clang/tools/extra
@@ -24,26 +22,22 @@ fi &&

if [[ "$LLVM_WITH_LLD" == y ]]; then
unpack_file 11 &&
- mv lld-${VERSION}.src lld &&
- ln -s ../../lld llvm/tools/lld
+ mv lld-${VERSION}.src lld
fi &&

if [[ "$LLVM_WITH_LLDB" == y ]]; then
unpack_file 13 &&
- mv lldb-${VERSION}.src lldb &&
- ln -s ../../lldb llvm/tools/lldb
+ mv lldb-${VERSION}.src lldb
fi &&

if [[ "$LLVM_WITH_MLIR" == y ]]; then
unpack_file 15 &&
- mv mlir-${VERSION}.src mlir &&
- ln -s ../../mlir llvm/tools/mlir
+ mv mlir-${VERSION}.src mlir
fi &&

if [[ "$LLVM_WITH_POLLY" == y ]]; then
unpack_file 17 &&
- mv polly-${VERSION}.src polly &&
- ln -s ../../polly llvm/tools/polly
+ mv polly-${VERSION}.src polly
fi &&

if [[ -n "$LLVM_RUNTIMES" ]] ;then
@@ -53,30 +47,25 @@ fi &&

if list_find "$LLVM_RUNTIMES" "compiler-rt"; then
unpack_file 21 &&
- mv compiler-rt-${VERSION}.src compiler-rt &&
- ln -s ../../compiler-rt llvm/runtimes/compiler-rt
+ mv compiler-rt-${VERSION}.src compiler-rt
fi &&

if list_find "$LLVM_RUNTIMES" "libcxx"; then
unpack_file 23 &&
- mv libcxx-${VERSION}.src libcxx &&
- ln -s ../../libcxx llvm/runtimes/libcxx
+ mv libcxx-${VERSION}.src libcxx
fi &&

if list_find "$LLVM_RUNTIMES" "libcxxabi"; then
unpack_file 25 &&
- mv libcxxabi-${VERSION}.src libcxxabi &&
- ln -s ../../libcxxabi llvm/runtimes/libcxxabi
+ mv libcxxabi-${VERSION}.src libcxxabi
fi &&

if list_find "$LLVM_RUNTIMES" "libunwind"; then
unpack_file 27 &&
- mv libunwind-${VERSION}.src libunwind &&
- ln -s ../../libunwind llvm/runtimes/libunwind
+ mv libunwind-${VERSION}.src libunwind
fi &&

if list_find "$LLVM_RUNTIMES" "openmp"; then
unpack_file 29 &&
- mv openmp-${VERSION}.src openmp &&
- ln -s ../../openmp llvm/runtimes/openmp
+ mv openmp-${VERSION}.src openmp
fi
diff --git a/devel/llvm/PRE_SUB_DEPENDS b/devel/llvm/PRE_SUB_DEPENDS
index a7ad716..b845d1d 100755
--- a/devel/llvm/PRE_SUB_DEPENDS
+++ b/devel/llvm/PRE_SUB_DEPENDS
@@ -3,7 +3,6 @@ case "$THIS_SUB_DEPENDS" in
list_find "$LLVM_TARGETS" "all" ||
list_find "$LLVM_TARGETS" "${THIS_SUB_DEPENDS#TARGET-}"
;;
- AMD) list_find "${LLVM_TARGETS}" AMDGPU ;;
CLANG) [[ "${LLVM_WITH_CLANG}" == "y" ]] ;;
LLDB) [[ "${LLVM_WITH_LLDB}" == "y" ]] ;;
POLLY) [[ "${LLVM_WITH_POLLY}" == "y" ]] ;;
diff --git a/devel/llvm/SUB_DEPENDS b/devel/llvm/SUB_DEPENDS
index 616de9c..7b3c73f 100755
--- a/devel/llvm/SUB_DEPENDS
+++ b/devel/llvm/SUB_DEPENDS
@@ -4,10 +4,6 @@ TARGET-*)
message "${MESSAGE_COLOR}$target target support enforced by
sub-dependency.$DEFAULT_COLOR"
list_add LLVM_TARGETS "$target"
;;
-AMD)
- message "${MESSAGE_COLOR}AMD support enforced by
sub-dependency.$DEFAULT_COLOR"
- list_add LLVM_TARGETS AMDGPU
-;;
CLANG)
message "${MESSAGE_COLOR}Building clang enforced by
sub-dependency.$DEFAULT_COLOR"
LLVM_WITH_CLANG=y
diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS
index 48278d8..86a1be1 100755
--- a/graphics-libs/mesa/DEPENDS
+++ b/graphics-libs/mesa/DEPENDS
@@ -18,7 +18,7 @@ if list_find "$MESA_GALLIUM" "nouveau"; then
LLVM_SUB_DEPS="RTTI ${LLVM_SUB_DEPS

if (list_find "${MESA_GALLIUM}" "radeonsi") ||
(list_find "$MESA_VULKAN" amd); then
- LLVM_SUB_DEPS="AMD ${LLVM_SUB_DEPS}" &&
+ LLVM_SUB_DEPS="TARGET-AMDGPU ${LLVM_SUB_DEPS}" &&
depends LIBELF
fi &&
if [[ -z "${LLVM_SUB_DEPS}" ]]; then
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index e6e1650..cfc38ca 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,6 @@
+2025-01-05 Justin Boffemmyer <flux AT sourcemage.org>
+ * DEPENDS: update llvm target sub-dependency naming
+
2025-01-04 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 24.3.3



  • [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (8aa2a983310badea2f0498a41eebe59fb75f1a4e), Justin Boffemmyer, 01/04/2025

Archive powered by MHonArc 2.6.24.

Top of Page