Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 devel/llvm/0001-Include-libunwind-from-source-directory.patch |   25 
++++++++++
 devel/llvm/DETAILS                                            |   18 +++++++
 devel/llvm/HISTORY                                            |    4 +
 devel/llvm/PRE_BUILD                                          |   18 ++++++-
 4 files changed, 62 insertions(+), 3 deletions(-)

New commits:
commit 83295fe5fa95f55198b32a4a2a23d342e4104b58
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/llvm: Unpack missing sources for building lld

diff --git a/devel/llvm/0001-Include-libunwind-from-source-directory.patch 
b/devel/llvm/0001-Include-libunwind-from-source-directory.patch
new file mode 100644
index 0000000..2b9bc64
--- /dev/null
+++ b/devel/llvm/0001-Include-libunwind-from-source-directory.patch
@@ -0,0 +1,25 @@
+From 2cf2b1af0f0be6431c1e239d482056ef4d4ac17f Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <Florian.Franzmann AT bandrate.org>
+Date: Sun, 2 May 2021 13:24:21 +0200
+Subject: [PATCH] Include libunwind from source directory
+
+---
+ lld/MachO/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lld/MachO/CMakeLists.txt b/lld/MachO/CMakeLists.txt
+index b76f37dcc6e6..69ca3fc6de67 100644
+--- a/lld/MachO/CMakeLists.txt
++++ b/lld/MachO/CMakeLists.txt
+@@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS Options.td)
+ tablegen(LLVM Options.inc -gen-opt-parser-defs)
+ add_public_tablegen_target(MachOOptionsTableGen)
+ 
+-include_directories(${LLVM_MAIN_SRC_DIR}/../libunwind/include)
++include_directories(${LLVM_MAIN_SRC_DIR}/libunwind/include)
+ 
+ add_lld_library(lldMachO2
+   Arch/X86_64.cpp
+-- 
+2.31.1
+
diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index 21cdd9c..a8a1423 100755
--- a/devel/llvm/DETAILS
+++ b/devel/llvm/DETAILS
@@ -50,6 +50,24 @@ if [[ "$LLVM_WITH_LLD" == y ]]; then
  SOURCE14_URL[0]="${SOURCE13_URL[0]}.sig"
      SOURCE13_GPG="llvm.gpg:$SOURCE14:UPSTREAM_KEY"
  SOURCE14_IGNORE="signature"
+         SOURCE15="libunwind-${VERSION}.src.tar.xz"
+  SOURCE15_URL[0]="${GITHUB_URI}/${SOURCE15}"
+        SOURCE16="$SOURCE15.sig"
+ SOURCE16_URL[0]="${SOURCE15_URL[0]}.sig"
+     SOURCE15_GPG="llvm.gpg:$SOURCE16:UPSTREAM_KEY"
+ SOURCE16_IGNORE="signature"
+         SOURCE17="libcxx-${VERSION}.src.tar.xz"
+  SOURCE17_URL[0]="${GITHUB_URI}/${SOURCE17}"
+        SOURCE18="$SOURCE17.sig"
+ SOURCE18_URL[0]="${SOURCE17_URL[0]}.sig"
+     SOURCE17_GPG="llvm.gpg:$SOURCE18:UPSTREAM_KEY"
+ SOURCE18_IGNORE="signature"
+         SOURCE19="libcxxabi-${VERSION}.src.tar.xz"
+  SOURCE19_URL[0]="${GITHUB_URI}/${SOURCE19}"
+        SOURCE20="$SOURCE19.sig"
+ SOURCE20_URL[0]="${SOURCE19_URL[0]}.sig"
+     SOURCE19_GPG="llvm.gpg:$SOURCE20:UPSTREAM_KEY"
+ SOURCE20_IGNORE="signature"
 fi
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}.src"
         WEB_SITE="https://llvm.org";
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 2a5414f..9399bdb 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,7 @@
+2021-05-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, DETAILS, 
0001-Include-libunwind-from-source-directory.patch:
+         Unpack missing sources for building lld
+
 2021-04-18 Ismael Luceno <ismael AT iodev.co.uk>
        * PRE_BUILD: edited patch to clang-tools-extra path
 
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index b424472..bcde14f 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -28,10 +28,17 @@ if [[ "$LLVM_WITH_POLLY" == y ]]; then
 fi &&
 
 if [[ "$LLVM_WITH_LLD" == y ]]; then
-  unpack_file 13               &&
-  mv lld-${VERSION}.src tools/lld
+  unpack_file 13                  &&
+  mv lld-${VERSION}.src tools/lld &&
+  unpack_file 15                  &&
+  mv libunwind-${VERSION}.src libunwind &&
+  unpack_file 17                  &&
+  mv libcxx-${VERSION}.src projects/libcxx &&
+  unpack_file 19                  &&
+  mv libcxxabi-${VERSION}.src projects/libcxxabi
 fi &&
 
+
 # small cmake related fix for libffi
 if spell_ok libffi;then
   FFI=`pkg-config --cflags-only-I libffi` &&
@@ -41,4 +48,9 @@ if spell_ok libffi;then
 fi  &&
 
 # do not build all backends
-sed -i "/^set.*all\"$/s/all//"  CMakeLists.txt
+sed -i "/^set.*all\"$/s/all//"  CMakeLists.txt &&
+
+# 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.
+cd "$SOURCE_DIRECTORY/tools" &&
+patch -p1 < 
"$SPELL_DIRECTORY/0001-Include-libunwind-from-source-directory.patch"