* [PR PATCH] llvm17: drop compiler-rt, include in clang17
@ 2024-02-11 4:03 Calandracas606
2024-02-11 4:03 ` [PR REVIEW] " Calandracas606
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Calandracas606 @ 2024-02-11 4:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]
There is a new pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages llvm17-require-compiler-rt
https://github.com/void-linux/void-packages/pull/48653
llvm17: drop compiler-rt, include in clang17
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: ***NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/48653.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-llvm17-require-compiler-rt-48653.patch --]
[-- Type: text/x-diff, Size: 3093 bytes --]
From d69a2da4d29725ee37c6e9c140bcc0a6dbf8c873 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Feb 2024 22:01:22 -0500
Subject: [PATCH] llvm17: drop compiler-rt, include in clang17
---
srcpkgs/compiler-rt | 1 -
srcpkgs/llvm17/template | 27 ++++++---------------------
2 files changed, 6 insertions(+), 22 deletions(-)
delete mode 120000 srcpkgs/compiler-rt
diff --git a/srcpkgs/compiler-rt b/srcpkgs/compiler-rt
deleted file mode 120000
index 96970d5c02c13..0000000000000
--- a/srcpkgs/compiler-rt
+++ /dev/null
@@ -1 +0,0 @@
-llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm17/template b/srcpkgs/llvm17/template
index aef0bf773d6be..a882209425034 100644
--- a/srcpkgs/llvm17/template
+++ b/srcpkgs/llvm17/template
@@ -1,7 +1,7 @@
# Template file for 'llvm17'
pkgname=llvm17
version=17.0.6
-revision=2
+revision=3
build_wrksrc=llvm
build_style=cmake
_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
@@ -59,11 +59,10 @@ fi
subpackages="libllvm17 llvm17-doc llvm17-devel"
_enabled_projects=
-_enabled_runtimes=
if [ "$build_option_clang" ]; then
_enabled_projects+="clang;"
- subpackages+=" clang17 clang17-headers clang17-devel libclang17 libclang-cpp17 clang-analyzer17 "
+ subpackages+=" clang17-headers clang17 clang17-devel libclang17 libclang-cpp17 clang-analyzer17 "
fi
if [ "$build_option_clang_tools_extra" ]; then
_enabled_projects+="clang-tools-extra;"
@@ -96,6 +95,8 @@ if [ "$build_option_flang" ]; then
subpackages+=" flang17 flang17-devel "
fi
+_enabled_runtimes="compiler-rt"
+
# enable if runtime subpackages link to this version of llvm
if true; then
subpackages+=" llvm-libunwind llvm-libunwind-devel "
@@ -104,9 +105,6 @@ if true; then
subpackages+=" libcxx libcxx-devel libcxxabi libcxxabi-devel "
_enabled_runtimes+="${_enabled_runtimes:+;}libcxxabi;libcxx"
- subpackages+=" compiler-rt "
- _enabled_runtimes+="${_enabled_runtimes:+;}compiler-rt"
-
case "$XBPS_TARGET_MACHINE" in
x86_64*|aarch64*)
# openmp fails when built as runtime if cross-compiled
@@ -119,9 +117,9 @@ if true; then
;;
esac
- configure_args+=" -DLLVM_ENABLE_RUNTIMES=${_enabled_runtimes}"
fi
+configure_args+=" -DLLVM_ENABLE_RUNTIMES=${_enabled_runtimes}"
configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
if [ "$CROSS_BUILD" ]; then
@@ -292,6 +290,7 @@ clang17_package() {
short_desc+=" - C language family frontend"
homepage="https://clang.llvm.org/"
pkg_install() {
+ vmove usr/lib/clang/17
vmove usr/bin/clang-17
vmove usr/bin/clang
vmove usr/bin/clang++
@@ -654,20 +653,6 @@ libcxx-devel_package() {
}
}
-compiler-rt_package() {
- short_desc+=" - runtime libraries"
- homepage="https://compiler-rt.llvm.org/"
- pkg_install() {
- vmove usr/lib/clang/17/lib
- if [ -d "${DESTDIR}/usr/lib/clang/17/bin" ]; then
- vmove usr/lib/clang/17/bin
- fi
- if [ -d "${DESTDIR}/usr/lib/clang/17/share" ]; then
- vmove usr/lib/clang/17/share
- fi
- }
-}
-
libllvm17_package() {
short_desc+=" - library"
pkg_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR REVIEW] llvm17: drop compiler-rt, include in clang17
2024-02-11 4:03 [PR PATCH] llvm17: drop compiler-rt, include in clang17 Calandracas606
@ 2024-02-11 4:03 ` Calandracas606
2024-02-11 14:00 ` Duncaen
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Calandracas606 @ 2024-02-11 4:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New review comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/48653#discussion_r1485458452
Comment:
re-order so that clang17-headers is installed before clang17
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: llvm17: drop compiler-rt, include in clang17
2024-02-11 4:03 [PR PATCH] llvm17: drop compiler-rt, include in clang17 Calandracas606
2024-02-11 4:03 ` [PR REVIEW] " Calandracas606
@ 2024-02-11 14:00 ` Duncaen
2024-02-11 14:00 ` Duncaen
2024-02-11 18:13 ` [PR PATCH] [Closed]: " Calandracas606
3 siblings, 0 replies; 5+ messages in thread
From: Duncaen @ 2024-02-11 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/48653#issuecomment-1937762800
Comment:
I think its better to keep this in a sub-package, for chromium `clang` is not needed for the target architecture, but the compiler-rt package is.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: llvm17: drop compiler-rt, include in clang17
2024-02-11 4:03 [PR PATCH] llvm17: drop compiler-rt, include in clang17 Calandracas606
2024-02-11 4:03 ` [PR REVIEW] " Calandracas606
2024-02-11 14:00 ` Duncaen
@ 2024-02-11 14:00 ` Duncaen
2024-02-11 18:13 ` [PR PATCH] [Closed]: " Calandracas606
3 siblings, 0 replies; 5+ messages in thread
From: Duncaen @ 2024-02-11 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/48653#issuecomment-1937762800
Comment:
I think its better to keep this in a sub-package, for chromium `clang17` is not needed for the target architecture, but the compiler-rt package is.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: llvm17: drop compiler-rt, include in clang17
2024-02-11 4:03 [PR PATCH] llvm17: drop compiler-rt, include in clang17 Calandracas606
` (2 preceding siblings ...)
2024-02-11 14:00 ` Duncaen
@ 2024-02-11 18:13 ` Calandracas606
3 siblings, 0 replies; 5+ messages in thread
From: Calandracas606 @ 2024-02-11 18:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 977 bytes --]
There's a closed pull request on the void-packages repository
llvm17: drop compiler-rt, include in clang17
https://github.com/void-linux/void-packages/pull/48653
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: ***NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
[ci skip]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-11 18:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-11 4:03 [PR PATCH] llvm17: drop compiler-rt, include in clang17 Calandracas606
2024-02-11 4:03 ` [PR REVIEW] " Calandracas606
2024-02-11 14:00 ` Duncaen
2024-02-11 14:00 ` Duncaen
2024-02-11 18:13 ` [PR PATCH] [Closed]: " Calandracas606
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).