Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 devel/llvm/HISTORY   |    3 +
 devel/llvm/PRE_BUILD |   85 
+++++++++++++++++++++++++++------------------------
 2 files changed, 48 insertions(+), 40 deletions(-)

New commits:
commit 7c3920e9fa6c69b46a0b7060f0db89c8a260ab1e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/llvm: unbroke split layout in PRE_BUILD

diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 5755372..9abc0fb 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,6 @@
+2026-09-02 Pavel Vinogradov <public AT sourcemage.org>
+       * PRE_BUILD: unbroke split layout
+
 2026-08-30 Pavel Vinogradov <public AT sourcemage.org>
        * PRE_BUILD: removed duplicity, reorganized unpacking, added kernel 
header fix
          for compiler-rt project (slot 22)
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index 99b62f5..d115ba3 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -1,42 +1,3 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ "$LLVM_WITH_SPIRV" == y ]]; then
-  unpack_file 33 &&
-  ln -s "../../SPIRV-LLVM-Translator-${SPIRV_VERSION}" llvm/tools/llvm-spirv
-fi &&
-
-if [[ $LLVM_LAYOUT == standalone ]]; then
-  # one tarball holding llvm itself, with the cmake modules it was split
-  # away from, and polly, laid back beside it
-
-  if [[ $SLOT == 15 ]]; then
-    apply_patch_dir patches-llvm15 &&
-    unpack_file 21 &&
-    mv cmake-${VERSION}.src/Modules/*cmake cmake
-  else
-    unpack_file 21 &&
-    mv cmake-${VERSION}.src/Modules cmake &&
-    sed '/LLVM_COMMON_CMAKE_UTILS /s;\.\./;;' -i CMakeLists.txt
-  fi &&
-
-  if [[ "$LLVM_WITH_POLLY" == y ]]; then
-    unpack_file 11 &&
-    mv polly-${VERSION}.src tools/polly
-  fi &&
-
-  # small cmake related fix for libffi
-  if spell_ok libffi;then
-    FFI=`pkg-config --cflags-only-I libffi` &&
-    FFI=${FFI//-I/} &&
-    FFI=${FFI//\ */} &&
-    sed -i "/FFI_I/s|\"\"|\"$FFI\"|" CMakeLists.txt
-  fi  &&
-
-  # do not build all backends
-  sed -i "/^set.*all\"$/s/all//"  CMakeLists.txt
-fi &&
-
 if [[ $LLVM_LAYOUT == split ]]; then
   # a tarball per component, unpacked into the tree they would have come
   # in had upstream shipped one
@@ -120,7 +81,51 @@ if [[ $LLVM_LAYOUT == split ]]; then
   if list_find "$LLVM_RUNTIMES" "openmp"; then
     unpack_file 29 &&
     mv "openmp-${VERSION}.src" openmp
-  fi
+  fi &&
+  if [[ "$LLVM_WITH_SPIRV" == y ]]; then
+    unpack_file 33 &&
+    ln -s "../../SPIRV-LLVM-Translator-${SPIRV_VERSION}" 
llvm/tools/llvm-spirv
+  fi &&
+  return
+fi &&
+
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ "$LLVM_WITH_SPIRV" == y ]]; then
+  unpack_file 33 &&
+  ln -s "../../SPIRV-LLVM-Translator-${SPIRV_VERSION}" llvm/tools/llvm-spirv
+fi &&
+
+if [[ $LLVM_LAYOUT == standalone ]]; then
+  # one tarball holding llvm itself, with the cmake modules it was split
+  # away from, and polly, laid back beside it
+
+  if [[ $SLOT == 15 ]]; then
+    apply_patch_dir patches-llvm15 &&
+    unpack_file 21 &&
+    mv cmake-${VERSION}.src/Modules/*cmake cmake
+  else
+    unpack_file 21 &&
+    mv cmake-${VERSION}.src/Modules cmake &&
+    sed '/LLVM_COMMON_CMAKE_UTILS /s;\.\./;;' -i CMakeLists.txt
+  fi &&
+
+  if [[ "$LLVM_WITH_POLLY" == y ]]; then
+    unpack_file 11 &&
+    mv polly-${VERSION}.src tools/polly
+  fi &&
+
+  # small cmake related fix for libffi
+  if spell_ok libffi;then
+    FFI=`pkg-config --cflags-only-I libffi` &&
+    FFI=${FFI//-I/} &&
+    FFI=${FFI//\ */} &&
+    sed -i "/FFI_I/s|\"\"|\"$FFI\"|" CMakeLists.txt
+  fi  &&
+
+  # do not build all backends
+  sed -i "/^set.*all\"$/s/all//"  CMakeLists.txt
 fi &&
 
 # fix kernel header path