Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 devel/llvm/DEPENDS   |    3 +++
 devel/llvm/HISTORY   |    3 +++
 devel/llvm/PRE_BUILD |   33 +++++++++++++++------------------
 3 files changed, 21 insertions(+), 18 deletions(-)

New commits:
commit 64793c9c18c9452344729e2d3ff2285bea10c134
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    llvm: Disable Clang sanitizers on musl

commit 7eed8c680aa23945ae48dc3d6d0396e937d47f44
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    llvm: Remove directory dance in PRE_BUILD

commit f523a1fc74e27d9019391b6fe0fba0f30d4ba8e8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    llvm: Add optional dependency on z3

diff --git a/devel/llvm/DEPENDS b/devel/llvm/DEPENDS
index 5a7a2de..fcd8823 100755
--- a/devel/llvm/DEPENDS
+++ b/devel/llvm/DEPENDS
@@ -11,6 +11,9 @@ depends zlib  '-DLLVM_ENABLE_ZLIB=1' &&
 depends python3 &&
 if [[ "$LLVM_WITH_ANALYZER" == "y" ]]
 then
+  optional_depends z3 \
+                   -DCLANG_ANALYZER_ENABLE_Z3_SOLVER={1,0} \
+                   'for Z3 solver support in Clang Static Analyzer' &&
   # perl is required for scan-build, which is the analyzer itself
   runtime_depends perl
 fi &&
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index b5f8543..5a4350a 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,5 +1,8 @@
 2019-08-21 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: removed broken llvm.org URLs
+       * DEPENDS: Added optional dependency on z3
+       * PRE_BUILD: Removed directory dancing
+         Disabled clang sanitizers on musl
 
 2019-07-20 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 8.0.1, added GitHub mirror
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index 225dc80..7dfd7cc 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -1,16 +1,18 @@
 default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
 if [[ "$LLVM_WITH_CLANG" == y ]]; then
-  cd ${SOURCE_DIRECTORY}/projects &&
   unpack_file 5 &&
-  mv compiler-rt-${VERSION}.src compiler-rt &&
-
-  cd ${SOURCE_DIRECTORY}/tools &&
+  mv compiler-rt-${VERSION}.src projects/compiler-rt &&
   unpack_file 3 &&
-  mv cfe-${VERSION}.src clang &&
-  cd "${SOURCE_DIRECTORY}/tools/clang/tools" &&
+  mv cfe-${VERSION}.src tools/clang &&
   unpack_file 9 &&
-  mv clang-tools-extra-${VERSION}.src extra &&
-  cd "${SOURCE_DIRECTORY}" &&
+  mv clang-tools-extra-${VERSION}.src tools/clang/tools/extra &&
+  # disable sanitizers on musl
+  case "$HOST" in *-musl)
+    sedit '/^ *set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE/s/TRUE/FALSE/' \
+        projects/compiler-rt/cmake/config-ix.cmake
+    ;;
+  esac &&
   patch -p1 < "${SPELL_DIRECTORY}/0001-fix-compile-error-clang.patch"
 #  cd ${SOURCE_DIRECTORY}/tools/clang &&
 #  patch -p1 < 
$SPELL_DIRECTORY/0001-fix-scan-view-s-module-search-path.patch &&
@@ -21,34 +23,29 @@ if [[ "$LLVM_WITH_CLANG" == y ]]; then
 fi &&
 
 if [[ "$LLVM_WITH_LLDB" == y ]]; then
-  cd ${SOURCE_DIRECTORY}/tools &&
   unpack_file 7                &&
-  mv lldb-${VERSION}.src lldb
+  mv lldb-${VERSION}.src tools/lldb
 fi &&
 
 if [[ "$LLVM_WITH_POLLY" == y ]]; then
-  cd ${SOURCE_DIRECTORY}/tools &&
   unpack_file 11                &&
-  mv polly-${VERSION}.src polly
+  mv polly-${VERSION}.src tools/polly
 fi &&
 
 if [[ "$LLVM_WITH_LLD" == y ]]; then
-  cd ${SOURCE_DIRECTORY}/tools &&
   unpack_file 13               &&
-  mv lld-${VERSION}.src lld
+  mv lld-${VERSION}.src tools/lld
 fi &&
 
 # small cmake related fix for libffi
-cd ${SOURCE_DIRECTORY} &&
 if spell_ok libffi;then
   FFI=`pkg-config --cflags-only-I libffi` &&
   FFI=${FFI//-I/} &&
   FFI=${FFI//\ */} &&
-  sed -i "/FFI_I/s|\"\"|\"$FFI\"|" "${SOURCE_DIRECTORY}/CMakeLists.txt"
+  sed -i "/FFI_I/s|\"\"|\"$FFI\"|" CMakeLists.txt
 fi  &&
 
 # do not build all backends
-sed -i "/^set.*all\"$/s/all//"  "${SOURCE_DIRECTORY}/CMakeLists.txt" &&
+sed -i "/^set.*all\"$/s/all//"  CMakeLists.txt &&
 
-cd "${SOURCE_DIRECTORY}" &&
 patch -p1 < "${SPELL_DIRECTORY}/0001-fix-compile-error.patch"