Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-llvm-versioned grimoire by Ismael Luceno (4bcb0a780b8a02f5a411faeaf27ac7ce3bbc5e48)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-llvm-versioned grimoire by Ismael Luceno (4bcb0a780b8a02f5a411faeaf27ac7ce3bbc5e48)
  • Date: Thu, 30 Mar 2023 18:43:44 +0000

GIT changes to devel-llvm-versioned grimoire by Ismael Luceno
<ismael AT sourcemage.org>:

devel/llvm15/0001-Include-libunwind-from-source-directory.patch | 25
-----
devel/llvm15/BUILD | 13
--
devel/llvm15/CONFIGURE | 8
-
devel/llvm15/DEPENDS | 21
----
devel/llvm15/DETAILS | 37
--------
devel/llvm15/FINAL | 27
------
devel/llvm15/HISTORY | 8
-
devel/llvm15/INSTALL | 39
--------
devel/llvm15/PREPARE | 5
-
devel/llvm15/PRE_BUILD | 35
-------
devel/llvm15/PRE_SUB_DEPENDS | 3
devel/llvm15/SUB_DEPENDS | 12
--
devel/llvm15/patches-clang/clang-001-fix-unwind-chain-inclusion.patch | 45
----------
devel/llvm15/patches-libcxx/libcxx-musl.patch | 28
------
devel/llvm15/patches-libcxx/libcxxabi-dl.patch | 27
------
devel/llvm15/patches-lldb/lldb-musl.patch | 12
--
16 files changed, 15 insertions(+), 330 deletions(-)

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

llvm15: Remove unnecessary components

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

llvm15: Remove SPELLX variable

diff --git a/devel/llvm15/0001-Include-libunwind-from-source-directory.patch
b/devel/llvm15/0001-Include-libunwind-from-source-directory.patch
deleted file mode 100644
index 2b9bc64..0000000
--- a/devel/llvm15/0001-Include-libunwind-from-source-directory.patch
+++ /dev/null
@@ -1,25 +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] 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/llvm15/BUILD b/devel/llvm15/BUILD
index 5d3e9ce..c770354 100755
--- a/devel/llvm15/BUILD
+++ b/devel/llvm15/BUILD
@@ -1,8 +1,3 @@
-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
@@ -12,11 +7,9 @@ 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
-if ! is_depends_enabled $SPELL libedit;then
- OPTS+=" -DLLVM_ENABLE_LIBEDIT=0" &&
- OPTS+=" -DLLVM_ENABLE_TERMINFO=0" &&
- OPTS+=" -DLLVM_ENABLE_BACKTRACES=0"
-fi &&
+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"
diff --git a/devel/llvm15/CONFIGURE b/devel/llvm15/CONFIGURE
index 6801af0..ec5d2d5 100755
--- a/devel/llvm15/CONFIGURE
+++ b/devel/llvm15/CONFIGURE
@@ -21,10 +21,4 @@ config_query_multi LLVM_TARGETS "which backend targets?" \
X86 \
XCore &&

-if [[ "$LLVM_WITH_CLANG" == "y" ]]
-then
- config_query LLVM_WITH_ANALYZER \
- "Install clang static analyzer (scan-build and scan-view)?" \
- n
-fi &&
-. $GRIMOIRE/CMAKE_CONFIGURE
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/devel/llvm15/DEPENDS b/devel/llvm15/DEPENDS
index 439d85a..c2f729f 100755
--- a/devel/llvm15/DEPENDS
+++ b/devel/llvm15/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
case "$HOST" in
(*-musl)
depends libexecinfo &&
@@ -11,21 +11,6 @@ depends PKG-CONFIG &&
depends zlib '-DLLVM_ENABLE_ZLIB=1' &&
depends python3 &&
depends mako &&
-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 &&

-optional_depends ocaml '' '' 'build bindings for OCaml' &&
-optional_depends doxygen '' '' "build documentation?" &&
-optional_depends libffi '-DLLVM_ENABLE_FFI=1
-DFFI_INCLUDE_DIR=/usr/lib/libffi-3.2.1/include' '' 'use sytem FFI' &&
-if [[ "$LLVM_WITH_LLDB" == y ]]; then
- depends six -DLLDB_USE_SYSTEM_SIX=YES &&
- depends swig &&
- depends libedit &&
- depends ncurses
-fi
+optional_depends libffi -DLLVM_ENABLE_FFI={1,0} \
+ 'For FFI support in the LLVM interpreter'
diff --git a/devel/llvm15/DETAILS b/devel/llvm15/DETAILS
index 48367f5..1757df6 100755
--- a/devel/llvm15/DETAILS
+++ b/devel/llvm15/DETAILS
@@ -1,49 +1,20 @@
+# Watch: https://github.com/llvm/llvm-project/releases
/llvmorg-(15[.][0-9.]+)[.]tar
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=llvm15
- SPELLX=llvm
VERSION=15.0.7
- SOURCE="${SPELLX}-${VERSION}.src.tar.xz"
+ 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_LLDB" == y ]]; then
- SOURCE7="lldb-${VERSION}.src.tar.xz"
- SOURCE7_URL[0]="${GITHUB_URI}/${SOURCE7}"
- SOURCE7_HASH=sha256:
-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
-fi
SOURCE21="cmake-${VERSION}.src.tar.xz"
SOURCE21_URL[0]="${GITHUB_URI}/${SOURCE21}"

SOURCE21_HASH=sha256:8986f29b634fdaa9862eedda78513969fe9788301c9f2d938f4c10a3e7a3e7ea
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}.src"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tar.xz}"
WEB_SITE="https://llvm.org";
LICENSE[0]=BSD
ENTERED=20230330
diff --git a/devel/llvm15/FINAL b/devel/llvm15/FINAL
deleted file mode 100755
index 2c196a7..0000000
--- a/devel/llvm15/FINAL
+++ /dev/null
@@ -1,27 +0,0 @@
-if [[ "$LLVM_WITH_ANALYZER" == "y" ]]; then
- target="${INSTALL_ROOT}/opt/llvm15/share/llvm" &&
-
- chown "root:root" "${target}/scan-build" &&
- chmod 0755 "${target}/scan-build" &&
-
- chown "root:root" "${target}/scan-view" &&
- chmod 0755 "${target}/scan-view" &&
-
- for i in ccc-analyzer c++-analyzer scan-build scan-view; do
- chown "root:root" "${INSTALL_ROOT}/opt/llvm15/bin/${i}" &&
- chmod 0755 "${INSTALL_ROOT}/opt/llvm15/bin/${i}"
- done &&
-
- for i in scanview.css sorttable.js; do
- chown "root:root" "${target}/scan-build/${i}" &&
- chmod 0644 "${target}/scan-build/${i}"
- done &&
-
- for i in Reporter.py ScanView.py startfile.py; do
- chown "root:root" "${target}/scan-view/${i}" &&
- chmod 0644 "${target}/scan-view/${i}"
- done &&
-
- chown "root:root" "${INSTALL_ROOT}/opt/llvm15/share/man/man1/scan-build.1"
&&
- chmod 0644 "${INSTALL_ROOT}/opt/llvm15/share/man/man1/scan-build.1"
-fi
diff --git a/devel/llvm15/HISTORY b/devel/llvm15/HISTORY
index e5751ec..ab7003a 100644
--- a/devel/llvm15/HISTORY
+++ b/devel/llvm15/HISTORY
@@ -1,6 +1,4 @@
2023-03-30 Conner Clere <xenanthropy AT sourcemage.org>
- * BUILD, CONFIGURE, DEPENDS, INSTALL, DETAILS: new spell, version
15.0.7
- * PRE_BUILD, PREPARE, PRE_SUB_DEPENDS, SUB_DEPENDS, FINAL: added
- * patches-clang/*, patches-libcxx/*, patches-lldb/*, patches-llvm/*:
added
- * 0001-Include-libunwind-from-source-directory.patch: added
-
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, PRE_BUILD, PREPARE,
+ PRE_SUB_DEPENDS, SUB_DEPENDS, patches-llvm/llvm-001-musl.patch:
+ new spell, version 15.0.7, based on the llvm spell
diff --git a/devel/llvm15/INSTALL b/devel/llvm15/INSTALL
deleted file mode 100755
index d56ede1..0000000
--- a/devel/llvm15/INSTALL
+++ /dev/null
@@ -1,39 +0,0 @@
-cmake_install &&
-
-ln -sfn /opt/llvm15/share/clang/run-clang-tidy.py
/opt/llvm15/bin/run-clang-tidy &&
-
-if [[ "$LLVM_WITH_ANALYZER" == "y" ]]
-then
- target="$INSTALL_ROOT/opt/llvm15/share/llvm" &&
-
- cd $SOURCE_DIRECTORY/tools/clang/tools &&
-
- install -v -d "$target/scan-build" &&
-
- for i in ccc-analyzer c++-analyzer; do
- install -v -t "${INSTALL_ROOT}/opt/llvm15/bin/" scan-build/libexec/${i}
- done &&
-
- for i in build view; do
- install -v -t "${INSTALL_ROOT}/opt/llvm15/bin/" scan-${i}/bin/scan-${i}
- done &&
-
- ln -sf "/opt/llvm15/bin/ccc-analyzer"
"${INSTALL_ROOT}/opt/llvm15/bin/c++-analyzer" &&
-
- for i in scanview.css sorttable.js; do
- install -v -t "$target/scan-build" scan-build/share/scan-build/${i}
- done &&
-
- install -v -d "$target/scan-view" &&
-
- for i in Reporter.py ScanView.py startfile.py; do
- install -v -t "$target/scan-view" scan-view/share/${i}
- done &&
-
- install -v -t "${INSTALL_ROOT}/opt/llvm15/share/man/man1/"
scan-build/man/scan-build.1
-fi &&
-
-if [[ "$LLVM_WITH_CLANG" == y ]] && spell_ok python3; then
- cd "${SOURCE_DIRECTORY}" &&
- cp -Rv "${SOURCE_DIRECTORY}/tools/clang/bindings/python/clang"
"${INSTALL_ROOT}/opt/llvm15/lib/python$(installed_version python3 | cut -f1,2
-d.)/"
-fi
diff --git a/devel/llvm15/PREPARE b/devel/llvm15/PREPARE
index 53c46bb..237b29e 100755
--- a/devel/llvm15/PREPARE
+++ b/devel/llvm15/PREPARE
@@ -1,5 +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_LLDB "Enable lldb debugger?" 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 e5837fc..27f152a 100755
--- a/devel/llvm15/PRE_BUILD
+++ b/devel/llvm15/PRE_BUILD
@@ -3,47 +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_LLDB" == y ]]; then
- unpack_file 7 &&
- mv lldb-${VERSION}.src tools/lldb &&
- apply_patch_dir patches-lldb
-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-libcxx &&
-
- # 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.
- # As of 2021-07-10 this has not been fixed.
- cd "$SOURCE_DIRECTORY/tools" &&
- patch -p1 <
"$SPELL_DIRECTORY/0001-Include-libunwind-from-source-directory.patch"
-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 0026e3f..7b0dafc 100755
--- a/devel/llvm15/PRE_SUB_DEPENDS
+++ b/devel/llvm15/PRE_SUB_DEPENDS
@@ -1,10 +1,7 @@
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" ]] ;;
-LLDB) [[ "${LLVM_WITH_LLDB}" == "y" ]] ;;
POLLY) [[ "${LLVM_WITH_POLLY}" == "y" ]] ;;
-LLD) [[ "${LLVM_WITH_LLD}" == "y" ]] ;;
RTTI) [ y = "$LLVM_WITH_RTTI" ] ;;
*)
message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
diff --git a/devel/llvm15/SUB_DEPENDS b/devel/llvm15/SUB_DEPENDS
index b9aee09..d4675c7 100755
--- a/devel/llvm15/SUB_DEPENDS
+++ b/devel/llvm15/SUB_DEPENDS
@@ -8,22 +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
-;;
-LLDB)
- message "${MESSAGE_COLOR}Building lldb enforced by
sub-dependency.$DEFAULT_COLOR"
- LLVM_WITH_LLDB=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-libcxx/libcxx-musl.patch
b/devel/llvm15/patches-libcxx/libcxx-musl.patch
deleted file mode 100644
index 3600f40..0000000
--- a/devel/llvm15/patches-libcxx/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-libcxx/libcxxabi-dl.patch
b/devel/llvm15/patches-libcxx/libcxxabi-dl.patch
deleted file mode 100644
index d47a227..0000000
--- a/devel/llvm15/patches-libcxx/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/llvm15/patches-lldb/lldb-musl.patch
b/devel/llvm15/patches-lldb/lldb-musl.patch
deleted file mode 100644
index f2ba9cc..0000000
--- a/devel/llvm15/patches-lldb/lldb-musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Origin: Void Linux
-
---- a/tools/lldb/source/Plugins/Process/Linux/Procfs.h
-+++ b/tools/lldb/source/Plugins/Process/Linux/Procfs.h
-@@ -10,6 +10,7 @@
- // sys/procfs.h on Android/Linux for all supported architectures.
-
- #include <sys/ptrace.h>
-+#include <asm/ptrace.h>
-
- #ifdef __ANDROID__
- #if defined(__arm64__) || defined(__aarch64__)



  • [SM-Commit] GIT changes to devel-llvm-versioned grimoire by Ismael Luceno (4bcb0a780b8a02f5a411faeaf27ac7ce3bbc5e48), Ismael Luceno, 03/30/2023

Archive powered by MHonArc 2.6.24.

Top of Page