From: Calandracas606 <Calandracas606@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] llvm17: fixup and refactor
Date: Fri, 09 Feb 2024 15:22:57 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48625@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]
There is a new pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages llvm17-fixup
https://github.com/void-linux/void-packages/pull/48625
llvm17: fixup and refactor
<!-- 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/48625.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-llvm17-fixup-48625.patch --]
[-- Type: text/x-diff, Size: 3549 bytes --]
From 0d0d6f7421ed540308f839cf53b16b6fb3f3d929 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 9 Feb 2024 09:20:48 -0500
Subject: [PATCH] llvm17: fixup and refactor
---
| 1 +
srcpkgs/llvm17/template | 28 ++++++++++++++++++++--------
2 files changed, 21 insertions(+), 8 deletions(-)
create mode 120000 srcpkgs/clang17-headers
--git a/srcpkgs/clang17-headers b/srcpkgs/clang17-headers
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/clang17-headers
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm17/template b/srcpkgs/llvm17/template
index 7bc22ec50272e..59e93de3c5f53 100644
--- a/srcpkgs/llvm17/template
+++ b/srcpkgs/llvm17/template
@@ -1,7 +1,7 @@
# Template file for 'llvm17'
pkgname=llvm17
version=17.0.6
-revision=1
+revision=2
build_wrksrc=llvm
build_style=cmake
_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
@@ -64,7 +64,7 @@ fi
if [ "$build_option_clang" ]; then
_enabled_projects+="clang;"
- subpackages+=" clang17 clang17-devel libclang17 libclang-cpp17 clang-analyzer17 "
+ subpackages+=" clang17 clang17-devel clang17-headers libclang17 libclang-cpp17 clang-analyzer17 "
fi
if [ "$build_option_clang_tools_extra" ]; then
_enabled_projects+="clang-tools-extra;"
@@ -280,7 +280,7 @@ post_install() {
clang17_package() {
lib32disabled=yes
depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel
- libclang17-${version}_${revision} "
+ llvm17-${version}_${revision} "
short_desc+=" - C language family frontend"
homepage="https://clang.llvm.org/"
pkg_install() {
@@ -313,10 +313,20 @@ clang17_package() {
}
}
+clang17-headers_package() {
+ lib32disabled=yes
+ short_desc+=" - C language family frontend - Headers"
+ homepage="https://clang.llvm.org/"
+ pkg_install() {
+ usr/lib/clang/17/include
+ vmove usr/lib/clang/17/include
+ }
+}
+
clang17-devel_package() {
lib32disabled=yes
depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel
- libclang17-${version}_${revision}"
+ clang17-${version}_${revision}"
short_desc+=" - C language family frontend - development Files"
homepage="https://clang.llvm.org/"
pkg_install() {
@@ -343,6 +353,7 @@ clang17-devel_package() {
}
libclang17_package() {
+ depends="clang17-headers-${version}_${revision}"
short_desc+=" - C frontend runtime library"
pkg_install() {
vmove "usr/lib/libclang.so.*"
@@ -350,6 +361,7 @@ libclang17_package() {
}
libclang-cpp17_package() {
+ depends="clang17-headers-${version}_${revision}"
short_desc+=" - C frontend runtime library (C++ interface)"
pkg_install() {
vmove "usr/lib/libclang-cpp.so.*"
@@ -637,7 +649,7 @@ libllvm17_package() {
}
llvm17-doc_package() {
- short_desc+=" - documentation "
+ short_desc+=" - documentation"
pkg_install() {
vmove usr/share/doc
}
@@ -647,13 +659,13 @@ llvm17-devel_package() {
short_desc+=" - development files"
depends="llvm17>=${version}_${revision}"
if [ "$build_option_openmp" ]; then
- depends+=" libomp-devel>={$version}_${revision} "
+ depends+=" libomp-devel>=${version}_${revision} "
fi
if [ "$build_option_mlir" ]; then
- depends+=" mlir17-devel>={$version}_${revision} "
+ depends+=" mlir17-devel>=${version}_${revision} "
fi
if [ "$build_option_clang" ]; then
- depends+=" clang17-devel>={$version}_${revision} "
+ depends+=" clang17-devel>=${version}_${revision} "
fi
pkg_install() {
vmove usr/lib/libLLVM.so
next reply other threads:[~2024-02-09 14:22 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-09 14:22 Calandracas606 [this message]
2024-02-09 14:24 ` [PR PATCH] [Updated] " Calandracas606
2024-02-09 14:25 ` Calandracas606
2024-02-09 14:46 ` Calandracas606
2024-02-09 14:58 ` Calandracas606
2024-02-09 16:37 ` Calandracas606
2024-02-09 18:01 ` Calandracas606
2024-02-09 18:27 ` Calandracas606
2024-02-09 18:30 ` Calandracas606
2024-02-09 18:48 ` Calandracas606
2024-02-09 20:55 ` Calandracas606
2024-02-09 21:59 ` Calandracas606
2024-02-09 22:01 ` Calandracas606
2024-02-10 0:51 ` Calandracas606
2024-02-10 2:11 ` Calandracas606
2024-02-10 2:15 ` Calandracas606
2024-02-10 2:38 ` Calandracas606
2024-02-10 2:42 ` [PR PATCH] [Updated] " Calandracas606
2024-02-10 4:09 ` Calandracas606
2024-02-10 4:15 ` Calandracas606
2024-02-10 4:22 ` [PR REVIEW] " Calandracas606
2024-02-10 4:22 ` Calandracas606
2024-02-10 4:22 ` Calandracas606
2024-02-10 4:22 ` Calandracas606
2024-02-10 4:22 ` Calandracas606
2024-02-10 16:40 ` [PR PATCH] [Updated] " Calandracas606
2024-02-10 17:06 ` [PR REVIEW] " Sqvid
2024-02-10 17:07 ` Sqvid
2024-02-10 17:14 ` Duncaen
2024-02-10 17:14 ` Duncaen
2024-02-10 17:15 ` Calandracas606
2024-02-10 17:17 ` Duncaen
2024-02-10 17:27 ` Duncaen
2024-02-10 17:29 ` Duncaen
2024-02-10 17:30 ` Duncaen
2024-02-10 17:31 ` Sqvid
2024-02-10 17:33 ` Sqvid
2024-02-10 17:44 ` Sqvid
2024-02-10 17:58 ` Calandracas606
2024-02-10 18:02 ` Calandracas606
2024-02-10 18:06 ` Duncaen
2024-02-10 18:06 ` Duncaen
2024-02-10 18:08 ` Duncaen
2024-02-10 18:11 ` Duncaen
2024-02-10 18:12 ` Duncaen
2024-02-10 18:46 ` Calandracas606
2024-02-10 18:47 ` [PR PATCH] [Updated] " Calandracas606
2024-02-10 21:01 ` Calandracas606
2024-02-10 21:18 ` Calandracas606
2024-02-10 21:22 ` Calandracas606
2024-02-10 21:30 ` [PR PATCH] [Merged]: " Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48625@inbox.vuxu.org \
--to=calandracas606@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).