sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (d220436e5f66ea5baaaba3439a4014306c8e7689)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d220436e5f66ea5baaaba3439a4014306c8e7689)
Date: Fri, 10 Nov 2023 22:22:23 +0000

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

ChangeLog
| 3
devel/llvm/DETAILS
| 4
devel/llvm/HISTORY
| 3
devel/llvm15/BUILD
| 10 +-
devel/llvm15/DEPENDS
| 4
devel/llvm15/DETAILS
| 32 -------
devel/llvm15/HISTORY
| 9 ++
devel/llvm15/PREPARE
| 4
devel/llvm15/PRE_BUILD
| 23 -----
devel/llvm15/PRE_SUB_DEPENDS
| 4
devel/llvm15/SUB_DEPENDS
| 8 -
devel/llvm15/patches-clang/clang-001-fix-unwind-chain-inclusion.patch
| 45 ----------
devel/llvm15/patches-lld/0001-Include-libunwind-from-source-directory.patch
| 28 ------
devel/llvm15/patches-lld/libcxx-musl.patch
| 28 ------
devel/llvm15/patches-lld/libcxxabi-dl.patch
| 27 ------
devel/llvm16/BUILD
| 27 ++++++
devel/llvm16/CONFIGURE
| 25 +++++
devel/llvm16/DEPENDS
| 14 +++
devel/llvm16/DETAILS
| 31 ++++++
devel/llvm16/HISTORY
| 4
devel/llvm16/PREPARE
| 2
devel/llvm16/PRE_BUILD
| 23 +++++
devel/llvm16/PRE_SUB_DEPENDS
| 10 ++
devel/llvm16/SUB_DEPENDS
| 23 +++++
devel/zig/DEPENDS
| 12 +-
devel/zig/DETAILS
| 4
devel/zig/HISTORY
| 3
27 files changed, 199 insertions(+), 211 deletions(-)

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

zig 0.11.0

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

llvm16: New spell, LLVM version 16

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

llvm15: PATCHLEVEL++

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

llvm15: Remove clang and lld

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

llvm15: Use $SPELL to determine install prefix

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

llvm15: Make libffi a hard dep

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

llvm15: Fix style to match llvm

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

llvm: Simplify SOURCE_DIRECTORY to match llvm15

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

llvm: Fix Watch line

diff --git a/ChangeLog b/ChangeLog
index 849bc33..b1907b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2023-03-30 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/llvm16: new spell, LLVM version 16
+
2023-11-09 Treeve Jelbert <treeve AT sourcemage.org>
* lxqt/lxqt-menu-data: added

diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index a8ae206..61dd501 100755
--- a/devel/llvm/DETAILS
+++ b/devel/llvm/DETAILS
@@ -1,4 +1,4 @@
-# Watch: https://github.com/llvm/llvm-project/releases /llvmorg-([0-9.]+).tar
+# Watch: https://github.com/llvm/llvm-project/releases
/llvmorg-([0-9.]+)[.]tar
SPELL=llvm
VERSION=17.0.4
SOURCE="${SPELL}-${VERSION}.src.tar.xz"
@@ -76,7 +76,7 @@ fi
SOURCE22_URL[0]="${SOURCE21_URL[0]}.sig"
SOURCE22_IGNORE=signature
SOURCE21_GPG="llvm.gpg:$SOURCE22:UPSTREAM_KEY"
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}.src"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tar.xz}"
WEB_SITE="https://llvm.org";
LICENSE[0]=BSD
ENTERED=20081115
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 7611629..06233ac 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,6 @@
+2023-11-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: simplified SOURCE_DIRECTORY to match llvm15
+
2023-10-31 Pavel Vinogradov <public AT sorcemage.org>
* DETAILS: version 17.0.4

diff --git a/devel/llvm15/BUILD b/devel/llvm15/BUILD
index f87da18..655cb4a 100755
--- a/devel/llvm15/BUILD
+++ b/devel/llvm15/BUILD
@@ -16,12 +16,12 @@ OPTS+=" -DLLVM_ENABLE_LIBEDIT=0" &&
OPTS+=" -DLLVM_ENABLE_TERMINFO=0" &&
OPTS+=" -DLLVM_ENABLE_BACKTRACES=0"
# Enable RTTI if requested, recommended, changing it breaks the ABI
-if [ y = "$LLVM_WITH_RTTI" ]; then
- OPTS+=" -DLLVM_ENABLE_RTTI=1"
+if [[ y == "$LLVM_WITH_RTTI" ]]; then
+ OPTS+=" -DLLVM_ENABLE_RTTI=ON"
else
- OPTS+=" -DLLVM_ENABLE_RTTI=0"
+ OPTS+=" -DLLVM_ENABLE_RTTI=OFF"
fi &&

-OPTS+=" -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF" &&
+OPTS+=" -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF
-DLLVM_INCLUDE_TESTS=OFF" &&

-cmake_build "${INSTALL_ROOT}/opt/llvm15"
+cmake_build "${INSTALL_ROOT}/opt/$SPELL"
diff --git a/devel/llvm15/DEPENDS b/devel/llvm15/DEPENDS
index c2f729f..355c8d5 100755
--- a/devel/llvm15/DEPENDS
+++ b/devel/llvm15/DEPENDS
@@ -11,6 +11,4 @@ depends PKG-CONFIG &&
depends zlib '-DLLVM_ENABLE_ZLIB=1' &&
depends python3 &&
depends mako &&
-
-optional_depends libffi -DLLVM_ENABLE_FFI={1,0} \
- 'For FFI support in the LLVM interpreter'
+depends libffi '-DLLVM_ENABLE_FFI=1'
diff --git a/devel/llvm15/DETAILS b/devel/llvm15/DETAILS
index aeffa6c..2e341a1 100755
--- a/devel/llvm15/DETAILS
+++ b/devel/llvm15/DETAILS
@@ -2,39 +2,15 @@
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=llvm15
VERSION=15.0.7
+ PATCHLEVEL=1
SOURCE="llvm-${VERSION}.src.tar.xz"

GITHUB_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$VERSION";
SOURCE_URL[0]="${GITHUB_URI}/${SOURCE}"

SOURCE_HASH=sha256:4ad8b2cc8003c86d0078d15d987d84e3a739f24aae9033865c027abae93ee7a4
-if [[ "$LLVM_WITH_CLANG" == y ]]; then
- SOURCE3="clang-${VERSION}.src.tar.xz"
- SOURCE3_URL[0]="${GITHUB_URI}/${SOURCE3}"
-
SOURCE3_HASH=sha256:a6b673ef15377fb46062d164e8ddc4d05c348ff8968f015f7f4af03f51000067
- SOURCE5="compiler-rt-${VERSION}.src.tar.xz"
- SOURCE5_URL[0]="${GITHUB_URI}/${SOURCE5}"
-
SOURCE5_HASH=sha256:353832c66cce60931ea0413b3c071faad59eefa70d02c97daa8978b15e4b25b7
- SOURCE9="clang-tools-extra-${VERSION}.src.tar.xz"
- SOURCE9_URL[0]="${GITHUB_URI}/${SOURCE9}"
-
SOURCE9_HASH=sha256:809a2ef46d46be3b83ca389356404ac041fa6d8f5496cb02ec35d252afb64fd1
-fi
if [[ "$LLVM_WITH_POLLY" == y ]]; then
- SOURCE11="polly-${VERSION}.src.tar.xz"
- SOURCE11_URL[0]="${GITHUB_URI}/${SOURCE11}"
-
SOURCE11_HASH=sha256:1053610cace401c0b4e6d430d441277b0283dd4112581e2acc90e174d3192819
-fi
-if [[ "$LLVM_WITH_LLD" == y ]]; then
- SOURCE13="lld-${VERSION}.src.tar.xz"
- SOURCE13_URL[0]="${GITHUB_URI}/${SOURCE13}"
-
SOURCE13_HASH=sha256:dba5c70c3fe88b3a38b9180df82fbc9d1dfd55d68f41fddd6a90f9e17f8e5df9
- SOURCE15="libunwind-${VERSION}.src.tar.xz"
- SOURCE15_URL[0]="${GITHUB_URI}/${SOURCE15}"
-
SOURCE15_HASH=sha256:406d199ae3a16add84017f40458a5e7c31f9412937fcb518715af0a0eeafbc0c
- SOURCE17="libcxx-${VERSION}.src.tar.xz"
- SOURCE17_URL[0]="${GITHUB_URI}/${SOURCE17}"
-
SOURCE17_HASH=sha256:8d4eaff1cb6e41439fbf3ededb46998a0a3564d66dd289f661bdd459c9277c11
- SOURCE19="libcxxabi-${VERSION}.src.tar.xz"
- SOURCE19_URL[0]="${GITHUB_URI}/${SOURCE19}"
-
SOURCE19_HASH=sha256:9b42f3951d845232e4cd58a0a9841838292dac138af19d4f8d0c08bd41004f43
+ SOURCE11="polly-${VERSION}.src.tar.xz"
+ SOURCE11_URL[0]="${GITHUB_URI}/${SOURCE11}"
+
SOURCE11_HASH=sha256:1053610cace401c0b4e6d430d441277b0283dd4112581e2acc90e174d3192819
fi
SOURCE21="cmake-${VERSION}.src.tar.xz"
SOURCE21_URL[0]="${GITHUB_URI}/${SOURCE21}"
diff --git a/devel/llvm15/HISTORY b/devel/llvm15/HISTORY
index 75aa70f..ee63a58 100644
--- a/devel/llvm15/HISTORY
+++ b/devel/llvm15/HISTORY
@@ -1,3 +1,12 @@
+2023-11-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * BUILD, DETAILS, PRE_SUB_DEPENDS: fixed style to match llvm
+ * DEPENDS: made libffi a hard dep
+ * BUILD: fixed to use $SPELL to determine prefix dir
+ * DETAILS, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS:
+ removed clang and lld
+ * patches-llvm/*, patches-lld/*: removed, no longer needed
+
2023-03-30 Conner Clere <xenanthropy AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY, PREPARE, PRE_BUILD,
PRE_SUB_DEPENDS, SUB_DEPENDS,
diff --git a/devel/llvm15/PREPARE b/devel/llvm15/PREPARE
index 0cfb539..237b29e 100755
--- a/devel/llvm15/PREPARE
+++ b/devel/llvm15/PREPARE
@@ -1,4 +1,2 @@
config_query LLVM_WITH_RTTI "Enable RTTI? (recommended)" y &&
-config_query LLVM_WITH_CLANG "Enable clang compiler frontend?" n &&
-config_query LLVM_WITH_POLLY "Enable polihedral optimizer?" n &&
-config_query LLVM_WITH_LLD "Enable llvm's linker?" n
+config_query LLVM_WITH_POLLY "Enable polihedral optimizer?" n
diff --git a/devel/llvm15/PRE_BUILD b/devel/llvm15/PRE_BUILD
index 0a81aec..27f152a 100755
--- a/devel/llvm15/PRE_BUILD
+++ b/devel/llvm15/PRE_BUILD
@@ -3,35 +3,12 @@ cd "$SOURCE_DIRECTORY" &&
apply_patch_dir patches-llvm &&
unpack_file 21 &&
mv cmake-${VERSION}.src/Modules/*cmake cmake &&
-if [[ "$LLVM_WITH_CLANG" == y ]]; then
- unpack_file 5 &&
- mv compiler-rt-${VERSION}.src runtimes/compiler-rt &&
- unpack_file 3 &&
- mv clang-${VERSION}.src tools/clang &&
- unpack_file 9 &&
- mv clang-tools-extra-${VERSION}.src tools/clang/tools/extra &&
- apply_patch_dir patches-clang &&
- sedit '/^[\t ]*set(model_compiler
/{s@[.][.]/clang-tools-@tools/clang/tools/@}' \
- tools/clang/tools/extra/clangd/quality/CompletionModel.cmake
-fi &&

if [[ "$LLVM_WITH_POLLY" == y ]]; then
unpack_file 11 &&
mv polly-${VERSION}.src tools/polly
fi &&

-if [[ "$LLVM_WITH_LLD" == y ]]; then
- unpack_file 13 &&
- mv lld-${VERSION}.src tools/lld &&
- unpack_file 15 &&
- mv libunwind-${VERSION}.src libunwind &&
- unpack_file 17 &&
- mv libcxx-${VERSION}.src runtimes/libcxx &&
- unpack_file 19 &&
- mv libcxxabi-${VERSION}.src runtimes/libcxxabi &&
- apply_patch_dir patches-lld
-fi &&
-
cd "$SOURCE_DIRECTORY" &&

# small cmake related fix for libffi
diff --git a/devel/llvm15/PRE_SUB_DEPENDS b/devel/llvm15/PRE_SUB_DEPENDS
index 8206f1b..3f35485 100755
--- a/devel/llvm15/PRE_SUB_DEPENDS
+++ b/devel/llvm15/PRE_SUB_DEPENDS
@@ -1,10 +1,8 @@
case $THIS_SUB_DEPENDS in
TARGET-*) list_find "$LLVM_TARGETS" "${THIS_SUB_DEPENDS#TARGET-}" ;;
AMD) list_find "${LLVM_TARGETS}" AMDGPU ;;
-CLANG) [[ "${LLVM_WITH_CLANG}" == "y" ]] ;;
POLLY) [[ "${LLVM_WITH_POLLY}" == "y" ]] ;;
-LLD) [[ "${LLVM_WITH_LLD}" == "y" ]] ;;
-RTTI) [ y = "$LLVM_WITH_RTTI" ] ;;
+RTTI) [[ y == "$LLVM_WITH_RTTI" ]] ;;
*)
message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1
diff --git a/devel/llvm15/SUB_DEPENDS b/devel/llvm15/SUB_DEPENDS
index a5e2c96..d4675c7 100755
--- a/devel/llvm15/SUB_DEPENDS
+++ b/devel/llvm15/SUB_DEPENDS
@@ -8,18 +8,10 @@ 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
-;;
POLLY)
message "${MESSAGE_COLOR}Building polly enforced by
sub-dependency.$DEFAULT_COLOR"
LLVM_WITH_POLLY=y
;;
-LLD)
- message "${MESSAGE_COLOR}Building lld enforced by
sub-dependency.$DEFAULT_COLOR"
- LLVM_WITH_LLD=y
-;;
RTTI)
message "${MESSAGE_COLOR}RTTI support enforced by
sub-dependency.$DEFAULT_COLOR"
LLVM_WITH_RTTI=y
diff --git
a/devel/llvm15/patches-clang/clang-001-fix-unwind-chain-inclusion.patch
b/devel/llvm15/patches-clang/clang-001-fix-unwind-chain-inclusion.patch
deleted file mode 100644
index adc3fcd..0000000
--- a/devel/llvm15/patches-clang/clang-001-fix-unwind-chain-inclusion.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <miwaxe AT gmail.com>
-Date: Tue, 8 Sep 2015 22:14:57 +0200
-Subject: [PATCH 2/7] fix unwind chain inclusion
-
-Origin: Void Linux
----
- lib/Headers/unwind.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h
-index 303d792..44e10cc 100644
---- a/tools/clang/lib/Headers/unwind.h
-+++ b/tools/clang/lib/Headers/unwind.h
-@@ -9,9 +9,6 @@
-
- /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
-
--#ifndef __CLANG_UNWIND_H
--#define __CLANG_UNWIND_H
--
- #if defined(__APPLE__) && __has_include_next(<unwind.h>)
- /* Darwin (from 11.x on) provide an unwind.h. If that's available,
- * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
-@@ -39,6 +36,9 @@
- # endif
- #else
-
-+#ifndef __CLANG_UNWIND_H
-+#define __CLANG_UNWIND_H
-+
- #include <stdint.h>
-
- #ifdef __cplusplus
-@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct
_Unwind_Context *);
- }
- #endif
-
-+#endif /* __CLANG_UNWIND_H */
-+
- #endif
-
--#endif /* __CLANG_UNWIND_H */
---
-2.5.1
diff --git
a/devel/llvm15/patches-lld/0001-Include-libunwind-from-source-directory.patch
b/devel/llvm15/patches-lld/0001-Include-libunwind-from-source-directory.patch
deleted file mode 100644
index 536d434..0000000
---
a/devel/llvm15/patches-lld/0001-Include-libunwind-from-source-directory.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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] Fix inclusion of libunwind from source directory
-
-Ref: https://groups.google.com/g/llvm-dev/c/gIY5COm6V5E
-Upstream-Status: Unknown [Should have been fixed by 12.0.1; as of
- 2021-07-10 this has not been fixed.]
----
- tools/lld/MachO/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/lld/MachO/CMakeLists.txt b/tools/lld/MachO/CMakeLists.txt
-index b76f37dcc6e6..69ca3fc6de67 100644
---- a/tools/lld/MachO/CMakeLists.txt
-+++ b/tools/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/llvm15/patches-lld/libcxx-musl.patch
b/devel/llvm15/patches-lld/libcxx-musl.patch
deleted file mode 100644
index 3600f40..0000000
--- a/devel/llvm15/patches-lld/libcxx-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Origin: Void Linux
-
---- a/runtimes/libcxx/include/locale
-+++ b/runtimes/libcxx/include/locale
-@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char*
__a_end,
- typename remove_reference<decltype(errno)>::type __save_errno =
errno;
- errno = 0;
- char *__p2;
-+#if defined(__linux__) && !defined(__GLIBC__)
-+ long long __ll = strtoll(__a, &__p2, __base);
-+#else
- long long __ll = strtoll_l(__a, &__p2, __base,
_LIBCPP_GET_C_LOCALE);
-+#endif
- typename remove_reference<decltype(errno)>::type __current_errno =
errno;
- if (__current_errno == 0)
- errno = __save_errno;
-@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const
char* __a_end,
- typename remove_reference<decltype(errno)>::type __save_errno =
errno;
- errno = 0;
- char *__p2;
-+#if defined(__linux__) && !defined(__GLIBC__)
-+ unsigned long long __ll = strtoull(__a, &__p2, __base);
-+#else
- unsigned long long __ll = strtoull_l(__a, &__p2, __base,
_LIBCPP_GET_C_LOCALE);
-+#endif
- typename remove_reference<decltype(errno)>::type __current_errno =
errno;
- if (__current_errno == 0)
- errno = __save_errno;
diff --git a/devel/llvm15/patches-lld/libcxxabi-dl.patch
b/devel/llvm15/patches-lld/libcxxabi-dl.patch
deleted file mode 100644
index d47a227..0000000
--- a/devel/llvm15/patches-lld/libcxxabi-dl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Also link to -ldl to prevent undefined references.
-
-Origin: Void Linux
-
---- a/runtimes/libcxxabi/src/CMakeLists.txt
-+++ b/runtimes/libcxxabi/src/CMakeLists.txt
-@@ -73,6 +73,7 @@
- endif()
-
- add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
-+ add_library_flags_if(LIBCXXABI_HAS_C_LIB dl)
- endif()
-
- if (LIBCXXABI_USE_LLVM_UNWINDER)
---- a/runtimes/libcxx/CMakeLists.txt
-+++ b/runtimes/libcxx/CMakeLists.txt
-@@ -745,6 +745,10 @@
- target_link_libraries(${target} PRIVATE m)
- endif()
-
-+ if (LIBCXX_HAS_C_LIB)
-+ target_link_libraries(${target} PRIVATE dl)
-+ endif()
-+
- if (LIBCXX_HAS_RT_LIB)
- target_link_libraries(${target} PRIVATE rt)
- endif()
diff --git a/devel/llvm16/BUILD b/devel/llvm16/BUILD
new file mode 100755
index 0000000..655cb4a
--- /dev/null
+++ b/devel/llvm16/BUILD
@@ -0,0 +1,27 @@
+case "$HOST" in
+ (*-musl)
+ OPTS+=' -DLIBCXX_HAS_MUSL_LIBC=YES'
+ ;;
+esac &&
+# Remove -DPIC from compiler flags, produces build errors
+CXXFLAGS="${CXXFLAGS//-DPIC}" &&
+# Default target, not detected correctly
+OPTS+=" -DLLVM_DEFAULT_TARGET_TRIPLE=$HOST" &&
+# LLVM_TARGETS
+OPTS+=" -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS// /;}" &&
+# recommended by mesa project
+OPTS+=" -DLLVM_LINK_LLVM_DYLIB=1 -DCMAKE_BUILD_TYPE=RELEASE" &&
+# prevent unnecessary use of libedit and ncurses
+OPTS+=" -DLLVM_ENABLE_LIBEDIT=0" &&
+OPTS+=" -DLLVM_ENABLE_TERMINFO=0" &&
+OPTS+=" -DLLVM_ENABLE_BACKTRACES=0"
+# Enable RTTI if requested, recommended, changing it breaks the ABI
+if [[ y == "$LLVM_WITH_RTTI" ]]; then
+ OPTS+=" -DLLVM_ENABLE_RTTI=ON"
+else
+ OPTS+=" -DLLVM_ENABLE_RTTI=OFF"
+fi &&
+
+OPTS+=" -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF
-DLLVM_INCLUDE_TESTS=OFF" &&
+
+cmake_build "${INSTALL_ROOT}/opt/$SPELL"
diff --git a/devel/llvm16/CONFIGURE b/devel/llvm16/CONFIGURE
new file mode 100755
index 0000000..75512bd
--- /dev/null
+++ b/devel/llvm16/CONFIGURE
@@ -0,0 +1,25 @@
+. $GRIMOIRE/config_query_multi.function &&
+message "$DEFAULT_COLOR$MESSAGE_COLOR" \
+ "LLVM can build multiple backends." \
+ "\nFor most people, X86 and AMDGPU are sufficient." &&
+config_query_multi LLVM_TARGETS "which backend targets?" \
+ AArch64 \
+ AMDGPU \
+ ARM \
+ AVR \
+ BPF \
+ Hexagon \
+ Lanai \
+ Mips \
+ MSP430 \
+ NVPTX \
+ PowerPC \
+ RISCV \
+ Sparc \
+ SystemZ \
+ VE \
+ WebAssembly \
+ X86 \
+ XCore &&
+
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/devel/llvm16/DEPENDS b/devel/llvm16/DEPENDS
new file mode 100755
index 0000000..355c8d5
--- /dev/null
+++ b/devel/llvm16/DEPENDS
@@ -0,0 +1,14 @@
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
+case "$HOST" in
+ (*-musl)
+ depends libexecinfo &&
+ depends musl-obstack
+ ;;
+esac &&
+depends libtool &&
+depends -sub CXX gcc &&
+depends PKG-CONFIG &&
+depends zlib '-DLLVM_ENABLE_ZLIB=1' &&
+depends python3 &&
+depends mako &&
+depends libffi '-DLLVM_ENABLE_FFI=1'
diff --git a/devel/llvm16/DETAILS b/devel/llvm16/DETAILS
new file mode 100755
index 0000000..44dd751
--- /dev/null
+++ b/devel/llvm16/DETAILS
@@ -0,0 +1,31 @@
+# Watch: https://github.com/llvm/llvm-project/tags
/llvmorg-(16[.][0-9.]+)[.]tar
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
+ SPELL=llvm16
+ VERSION=16.0.6
+ SOURCE="llvm-${VERSION}.src.tar.xz"
+
GITHUB_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$VERSION";
+ SOURCE_URL[0]="${GITHUB_URI}/${SOURCE}"
+
SOURCE_HASH=sha512:8d4cdadc9a1ad249fbf9248c8e56f3bcafab73a473a0b0ca73499ed8825c62e27668aac4f1d03341631e5ad93701621e834e9e196ca32eac3ef805cf1c860083
+if [[ "$LLVM_WITH_POLLY" == y ]]; then
+ SOURCE11="polly-${VERSION}.src.tar.xz"
+ SOURCE11_URL[0]="${GITHUB_URI}/${SOURCE11}"
+
SOURCE11_HASH=sha512:791473c145930fcd1541002c5385c2fbc1b6dbecc60ca19b69f81d4df27a324609d1b0fc2723893147886eab988b4bf88e9c0ca815b1aa5b0a10d899cf32bc7e
+fi
+ SOURCE21="cmake-${VERSION}.src.tar.xz"
+ SOURCE21_URL[0]="${GITHUB_URI}/${SOURCE21}"
+
SOURCE21_HASH=sha512:52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tar.xz}"
+ WEB_SITE="https://llvm.org";
+ LICENSE[0]=BSD
+ ENTERED=20231110
+ SHORT="A novel compiler infrastructure for the optimization of
programs."
+ TMPFS=off # Well, needs about 5G space, plus actual RAM for
compiling.
+ STAGED_INSTALL=off # chmod issues with castfs
+cat << EOF
+Low-Level Virtual Machine (LLVM) is a compiler infrastructure designed for
+compile-time, link-time, run-time, and "idle-time" optimization of programs
+from arbitrary programming languages. It currently supports compilation of
+C, Objective-C, and C++ programs, using front-ends derived from GCC 4.0,
+GCC 4.2, and a custom new front-end, "clang". It supports x86, x86_64, ia64,
+PowerPC, and SPARC, with support for Alpha and ARM under development.
+EOF
diff --git a/devel/llvm16/HISTORY b/devel/llvm16/HISTORY
new file mode 100644
index 0000000..a40f0ce
--- /dev/null
+++ b/devel/llvm16/HISTORY
@@ -0,0 +1,4 @@
+2023-11-10 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, DETS, HISTORY, PREP, PRE_BUILD,
+ PRE_SUB_DEPENDS, SUB_DEPENDS:
+ new spell, created from the llvm15 spell
diff --git a/devel/llvm16/PREPARE b/devel/llvm16/PREPARE
new file mode 100755
index 0000000..237b29e
--- /dev/null
+++ b/devel/llvm16/PREPARE
@@ -0,0 +1,2 @@
+config_query LLVM_WITH_RTTI "Enable RTTI? (recommended)" y &&
+config_query LLVM_WITH_POLLY "Enable polihedral optimizer?" n
diff --git a/devel/llvm16/PRE_BUILD b/devel/llvm16/PRE_BUILD
new file mode 100755
index 0000000..b3338d3
--- /dev/null
+++ b/devel/llvm16/PRE_BUILD
@@ -0,0 +1,23 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+unpack_file 21 &&
+mv cmake-${VERSION}.src/Modules cmake &&
+sed '/LLVM_COMMON_CMAKE_UTILS /s;\.\./;;' -i CMakeLists.txt &&
+
+if [[ "$LLVM_WITH_POLLY" == y ]]; then
+ unpack_file 11 &&
+ mv polly-${VERSION}.src tools/polly
+fi &&
+
+cd "$SOURCE_DIRECTORY" &&
+
+# 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
diff --git a/devel/llvm16/PRE_SUB_DEPENDS b/devel/llvm16/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..3f35485
--- /dev/null
+++ b/devel/llvm16/PRE_SUB_DEPENDS
@@ -0,0 +1,10 @@
+case $THIS_SUB_DEPENDS in
+TARGET-*) list_find "$LLVM_TARGETS" "${THIS_SUB_DEPENDS#TARGET-}" ;;
+AMD) list_find "${LLVM_TARGETS}" AMDGPU ;;
+POLLY) [[ "${LLVM_WITH_POLLY}" == "y" ]] ;;
+RTTI) [[ y == "$LLVM_WITH_RTTI" ]] ;;
+ *)
+ message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1
+;;
+esac
diff --git a/devel/llvm16/SUB_DEPENDS b/devel/llvm16/SUB_DEPENDS
new file mode 100755
index 0000000..d4675c7
--- /dev/null
+++ b/devel/llvm16/SUB_DEPENDS
@@ -0,0 +1,23 @@
+case $THIS_SUB_DEPENDS in
+TARGET-*)
+ target="${THIS_SUB_DEPENDS#TARGET-}"
+ message "${MESSAGE_COLOR}$target target support enforced by
subdep.$DEFAULT_COLOR"
+ list_add LLVM_TARGETS "$target"
+;;
+AMD)
+ message "${MESSAGE_COLOR}AMD support enforced by
sub-dependency.$DEFAULT_COLOR"
+ list_add LLVM_TARGETS AMDGPU
+;;
+POLLY)
+ message "${MESSAGE_COLOR}Building polly enforced by
sub-dependency.$DEFAULT_COLOR"
+ LLVM_WITH_POLLY=y
+;;
+RTTI)
+ message "${MESSAGE_COLOR}RTTI support enforced by
sub-dependency.$DEFAULT_COLOR"
+ LLVM_WITH_RTTI=y
+;;
+ *)
+ message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1
+;;
+esac
diff --git a/devel/zig/DEPENDS b/devel/zig/DEPENDS
index bb6b7a8..e24e797 100755
--- a/devel/zig/DEPENDS
+++ b/devel/zig/DEPENDS
@@ -2,10 +2,10 @@
. "$GRIMOIRE"/VDEPENDS &&
vdepends <<!
cmake >= 2.8.12
- llvm15[CLANG,LLD]
- llvm15[TARGET-AArch64,TARGET-AMDGPU,TARGET-ARM,TARGET-AVR,TARGET-BPF]
- llvm15[TARGET-Hexagon,TARGET-Mips,TARGET-MSP430,TARGET-NVPTX]
- llvm15[TARGET-PowerPC,TARGET-RISCV,TARGET-Sparc,TARGET-SystemZ]
- llvm15[TARGET-WebAssembly,TARGET-X86]
- llvm15[TARGET-Lanai,TARGET-XCore,TARGET-VE]
+ llvm16[CLANG,LLD]
+ llvm16[TARGET-AArch64,TARGET-AMDGPU,TARGET-ARM,TARGET-AVR,TARGET-BPF]
+ llvm16[TARGET-Hexagon,TARGET-Mips,TARGET-MSP430,TARGET-NVPTX]
+ llvm16[TARGET-PowerPC,TARGET-RISCV,TARGET-Sparc,TARGET-SystemZ]
+ llvm16[TARGET-WebAssembly,TARGET-X86]
+ llvm16[TARGET-Lanai,TARGET-XCore,TARGET-VE]
!
diff --git a/devel/zig/DETAILS b/devel/zig/DETAILS
index 748dce8..fb849a6 100755
--- a/devel/zig/DETAILS
+++ b/devel/zig/DETAILS
@@ -1,10 +1,10 @@
# Watch: https://github.com/ziglang/zig/tags /tags/([0-9.]+)[.]tar
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=zig
- VERSION=0.10.1
+ VERSION=0.11.0
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/ziglang/$SPELL/archive/refs/tags/$VERSION.tar.gz
-
SOURCE_HASH=sha512:3df9cde13793b72251e8fc875ec3385c040d15ed8621344afe74c0d63adc66abc8a3d5279782c703bb6f6dc22aa4cb7daa85933f57544d42e3a4612c0d6051da
+
SOURCE_HASH=sha512:01e3eeaa14505ffdf2606c1a9588ed9392b082b081a546217790c9f3535acfc0e3fe8be2dc2911868b42be773429cec247c338bdd5d16f5cd593dcbe4104cf6f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="https://ziglang.org/";
LICENSE[0]="MIT"
diff --git a/devel/zig/HISTORY b/devel/zig/HISTORY
index 658b82f..f41370e 100644
--- a/devel/zig/HISTORY
+++ b/devel/zig/HISTORY
@@ -1,3 +1,6 @@
+2023-11-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.11.0
+
2023-03-05 Conner Clere <xenanthropy AT sourcemage.org>
* PROVIDES: added, provides ZIG
* CONFLICTS: added, conflicts with zig-bootstrap

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (d220436e5f66ea5baaaba3439a4014306c8e7689), Ismael Luceno, 11/10/2023