* [PR PATCH] Llvm metapkg
@ 2024-11-23 21:28 Calandracas606
2024-11-23 21:51 ` [PR PATCH] [Updated] " Calandracas606
2024-11-23 21:53 ` Calandracas606
0 siblings, 2 replies; 3+ messages in thread
From: Calandracas606 @ 2024-11-23 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is a new pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages llvm-metapkg
https://github.com/void-linux/void-packages/pull/53198
Llvm metapkg
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53198.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-llvm-metapkg-53198.patch --]
[-- Type: text/x-diff, Size: 10861 bytes --]
From 266b8762f7c88d1415704dae59421611979de912 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 23 Nov 2024 16:10:38 -0500
Subject: [PATCH 1/2] llvm: update to 19.
---
srcpkgs/clang-devel | 1 +
srcpkgs/flang | 1 +
srcpkgs/flang-devel | 1 +
srcpkgs/libclc | 1 +
srcpkgs/libclc/template | 36 ------------------
srcpkgs/lld-devel | 1 +
srcpkgs/lldb-devel | 1 +
srcpkgs/llvm-bolt | 1 +
srcpkgs/llvm-devel | 1 +
srcpkgs/llvm/template | 84 +++++++++++++++++++++++++++++++++++++++--
srcpkgs/mlir | 1 +
srcpkgs/mlir-devel | 1 +
12 files changed, 91 insertions(+), 39 deletions(-)
create mode 120000 srcpkgs/clang-devel
create mode 120000 srcpkgs/flang
create mode 120000 srcpkgs/flang-devel
create mode 120000 srcpkgs/libclc
delete mode 100644 srcpkgs/libclc/template
create mode 120000 srcpkgs/lld-devel
create mode 120000 srcpkgs/lldb-devel
create mode 120000 srcpkgs/llvm-bolt
create mode 120000 srcpkgs/llvm-devel
create mode 120000 srcpkgs/mlir
create mode 120000 srcpkgs/mlir-devel
diff --git a/srcpkgs/clang-devel b/srcpkgs/clang-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/clang-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/flang b/srcpkgs/flang
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/flang
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/flang-devel b/srcpkgs/flang-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/flang-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/libclc b/srcpkgs/libclc
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/libclc
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
deleted file mode 100644
index 63d5a06fa2bb7d..00000000000000
--- a/srcpkgs/libclc/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'libclc'
-pkgname=libclc
-version=18.1.8
-revision=3
-build_style=cmake
-# disable clspv (failing tests, we don't ship it)
-configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm/18/ -DCMAKE_BUILD_TYPE=Release
- -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-"
-hostmakedepends="llvm18-devel python3 libedit-devel libffi-devel
- ncurses-devel zlib-devel SPIRV-LLVM-Translator"
-short_desc="Open implementation of the OpenCL C programming language"
-maintainer="Daniel Martinez <danielmartinez@cock.li>"
-license="BSD-3-Clause, MIT"
-homepage="https://libclc.llvm.org"
-distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz"
-checksum=905bd59e9f810d6bd0ae6874725a8f8a3c91cb416199c03f2b98b57437cfb32e
-replaces="libclc-git>=0"
-
-alternatives="
- libclc:/usr/share/clc:/usr/lib/llvm/18/share/clc
- libclc:/usr/include/clc:/usr/lib/llvm/18/include/clc
- libclc:/usr/share/pkgconfig/libclc.pc:/usr/lib/llvm/18/share/pkgconfig/libclc.pc
-"
-
-do_configure() {
- # We really do a native build.
- # The outcome is just header files.
- unset CC CXX LD CFLAGS CXXFLAGS LDFLAGS
- mkdir -p build
- cd build
- cmake -GNinja ${configure_args} ..
-}
-
-post_install() {
- vlicense LICENSE.TXT
-}
diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/lld-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/lldb-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm-bolt b/srcpkgs/llvm-bolt
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/llvm-bolt
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm-devel b/srcpkgs/llvm-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/llvm-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 18e3a5c4669957..3a7781867f95fc 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,45 +1,79 @@
# Template file for 'llvm'
pkgname=llvm
-version=17
-revision=5
+version=19
+revision=1
build_style=meta
depends="llvm${version}"
short_desc="LLVM meta package"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Public Domain"
homepage="https://www.voidlinux.org"
-replaces="llvm15>=0 llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
+replaces="llvm18>=0 llvm17>=0 llvm15>=0 llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0
+ llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
+
+llvm-devel_package() {
+ build_style=meta
+ replaces="llvm18-devel>=0 llvm17-devel>=0"
+ depends="llvm${version}-devel>=0"
+ short_desc+=" - transitional meta package"
+}
clang_package() {
build_style=meta
+ replaces="clang18>=0 clang17>=0"
depends="clang${version}>=0"
short_desc+=" - clang"
}
+clang-devel_package() {
+ build_style=meta
+ replaces="clang18-devel>=0 clang17-devel>=0"
+ depends="clang${version}-devel>=0"
+ short_desc+=" - transitional meta package"
+}
+
clang-tools-extra_package() {
build_style=meta
+ replaces="clang-tools-extra18>=0 clang-tools-extra17>=0"
depends="clang-tools-extra${version}>=0"
short_desc+=" - clang-tools-extra"
}
clang-analyzer_package() {
build_style=meta
+ replaces="clang-analyzer18>=0 clang-analyzer17>=0"
depends="clang-analyzer${version}>=0"
short_desc+=" - clang-analyzer"
}
lld_package() {
build_style=meta
+ replaces="lld18>=0 lld17>=0"
depends="lld${version}>=0"
short_desc+=" - lld"
}
+lld-devel_package() {
+ build_style=meta
+ replaces="lld18-devel>=0 lld17-devel>=0"
+ depends="lld${version}-devel>=0"
+ short_desc+=" - transitional meta package"
+}
+
lldb_package() {
build_style=meta
+ replaces="lldb18>=0 lldb17>=0"
depends="lldb${version}>=0"
short_desc+=" - lldb"
}
+lldb-devel_package() {
+ build_style=meta
+ replaces="lldb18-devel>=0 lldb17-devel>=0"
+ depends="lldb${version}-devel>=0"
+ short_desc+=" - transitional meta package"
+}
+
compiler-rt_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
@@ -68,6 +102,7 @@ libllvm_package() {
libomp_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
+ replaces="libomp18>=0 libomp17>=0"
depends="libomp${version}>=0"
short_desc+=" - transitional meta package"
}
@@ -75,6 +110,49 @@ libomp_package() {
libomp-devel_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
+ replaces="libomp18-devel>=0 libomp17-devel>=0"
depends="libomp${version}-devel>=0"
short_desc+=" - transitional meta package"
}
+
+mlir_package() {
+ build_style=meta
+ replaces="mlir18>=0 mlir17>=0"
+ depends="mlir${version}>=0"
+ short_desc+=" - transitional meta package"
+}
+
+mlir-devel_package() {
+ build_style=meta
+ replaces="mlir18-devel>=0 mlir17-devel>=0"
+ depends="mlir${version}-devel>=0"
+ short_desc+=" - transitional meta package"
+}
+
+flang_package() {
+ build_style=meta
+ replaces="flang18>=0 flang17>=0"
+ depends="flang${version}>=0"
+ short_desc+=" - transitional meta package"
+}
+
+flang-devel_package() {
+ build_style=meta
+ replaces="flang18-devel>=0 flang17-devel>=0"
+ depends="flang${version}-devel>=0"
+ short_desc+=" - transitional meta package"
+}
+
+llvm-bolt_package() {
+ build_style=meta
+ replaces="llvm-bolt18>=0 llvm-bolt17>=0"
+ depends="llvm-bolt${version}>=0"
+ short_desc+=" - transitional meta package"
+}
+
+libclc_package() {
+ build_style=meta
+ replaces="libclc-git>=0"
+ depends="libclc${version}>=0"
+ short_desc+=" - transitional meta package"
+}
diff --git a/srcpkgs/mlir b/srcpkgs/mlir
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/mlir
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/mlir-devel b/srcpkgs/mlir-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/mlir-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
From b96923c95df9d8381b10d5e946903bb92f7a4292 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 23 Nov 2024 16:24:45 -0500
Subject: [PATCH 2/2] SPIRV-LLVM-Translator: update to 19.
---
common/shlibs | 1 -
srcpkgs/SPIRV-LLVM-Translator/template | 33 +++++++-------------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 828c6aa855e040..36f1ca12cd7a94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -999,7 +999,6 @@ libclang-cpp.so.17 libclang-cpp17-17.0.6_1
libLLVM-17.so libllvm17-17.0.6_1
libLLVM.so.18.1 libllvm18-18.1.8_1
libLLVM.so.19.1 libllvm19-19.1.0_1
-libLLVMSPIRVLib.so.18.1 SPIRV-LLVM-Translator-18.1.2_1
libLLVMSPIRVLib.so.19.1 SPIRV-LLVM-Translator19-19.1.1_1
libomp.so.5 libomp-17.0.6_1
libomptarget.so.18.1 libomp-18.1.8_1
diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template
index 8b9bd91ed79eee..978f3a9a1da576 100644
--- a/srcpkgs/SPIRV-LLVM-Translator/template
+++ b/srcpkgs/SPIRV-LLVM-Translator/template
@@ -1,33 +1,16 @@
# Template file for 'SPIRV-LLVM-Translator'
pkgname=SPIRV-LLVM-Translator
-version=18.1.3
+version=19
revision=1
-build_style=cmake
-configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
- -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON
- -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr"
-hostmakedepends="clang18 llvm18"
-makedepends="llvm18-devel SPIRV-Headers SPIRV-Tools-devel"
-short_desc="API and commands for processing SPIR-V modules"
+build_style=meta
+depends="SPIRV-LLVM-Translator${version}"
+short_desc="Bidirectional SPIR-V to LLVM Translator - transitional meta package"
maintainer="Daniel Martinez <danielmartinez@cock.li>"
-license="NCSA"
-homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
-checksum=d896f35102c3ba9e16ead7b4db53b75e6131982cdb36a3324f17c68a43598759
-
-alternatives="llvm-spirv:llvm-spirv:/usr/bin/llvm-spirv-${version%.*.*}"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/llvm-spirv ${DESTDIR}/usr/bin/llvm-spirv-${version%.*.*}
- vlicense LICENSE.TXT
-}
+license="Public Domain"
+homepage="https://www.voidlinux.org"
SPIRV-LLVM-Translator-devel_package() {
- depends="SPIRV-LLVM-Translator-${version}_${revision}"
+ build_style=meta
+ depends="SPIRV-LLVM-Translator${version}-devel>=0"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Llvm metapkg
2024-11-23 21:28 [PR PATCH] Llvm metapkg Calandracas606
@ 2024-11-23 21:51 ` Calandracas606
2024-11-23 21:53 ` Calandracas606
1 sibling, 0 replies; 3+ messages in thread
From: Calandracas606 @ 2024-11-23 21:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages llvm-metapkg
https://github.com/void-linux/void-packages/pull/53198
Llvm metapkg
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53198.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-llvm-metapkg-53198.patch --]
[-- Type: text/x-diff, Size: 12146 bytes --]
From a223ae163c76c8d9b68c6a90594f09050ea98919 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 23 Nov 2024 16:10:38 -0500
Subject: [PATCH 1/3] llvm: update to 19.
---
srcpkgs/clang-devel | 1 +
srcpkgs/flang | 1 +
srcpkgs/flang-devel | 1 +
srcpkgs/libclc | 1 +
srcpkgs/libclc/template | 36 --------------
srcpkgs/lld-devel | 1 +
srcpkgs/lldb-devel | 1 +
srcpkgs/llvm-bolt | 1 +
srcpkgs/llvm-devel | 1 +
srcpkgs/llvm/template | 101 +++++++++++++++++++++++++++++++++++-----
srcpkgs/mlir | 1 +
srcpkgs/mlir-devel | 1 +
12 files changed, 100 insertions(+), 47 deletions(-)
create mode 120000 srcpkgs/clang-devel
create mode 120000 srcpkgs/flang
create mode 120000 srcpkgs/flang-devel
create mode 120000 srcpkgs/libclc
delete mode 100644 srcpkgs/libclc/template
create mode 120000 srcpkgs/lld-devel
create mode 120000 srcpkgs/lldb-devel
create mode 120000 srcpkgs/llvm-bolt
create mode 120000 srcpkgs/llvm-devel
create mode 120000 srcpkgs/mlir
create mode 120000 srcpkgs/mlir-devel
diff --git a/srcpkgs/clang-devel b/srcpkgs/clang-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/clang-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/flang b/srcpkgs/flang
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/flang
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/flang-devel b/srcpkgs/flang-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/flang-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/libclc b/srcpkgs/libclc
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/libclc
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
deleted file mode 100644
index 63d5a06fa2bb7d..00000000000000
--- a/srcpkgs/libclc/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'libclc'
-pkgname=libclc
-version=18.1.8
-revision=3
-build_style=cmake
-# disable clspv (failing tests, we don't ship it)
-configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm/18/ -DCMAKE_BUILD_TYPE=Release
- -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-"
-hostmakedepends="llvm18-devel python3 libedit-devel libffi-devel
- ncurses-devel zlib-devel SPIRV-LLVM-Translator"
-short_desc="Open implementation of the OpenCL C programming language"
-maintainer="Daniel Martinez <danielmartinez@cock.li>"
-license="BSD-3-Clause, MIT"
-homepage="https://libclc.llvm.org"
-distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz"
-checksum=905bd59e9f810d6bd0ae6874725a8f8a3c91cb416199c03f2b98b57437cfb32e
-replaces="libclc-git>=0"
-
-alternatives="
- libclc:/usr/share/clc:/usr/lib/llvm/18/share/clc
- libclc:/usr/include/clc:/usr/lib/llvm/18/include/clc
- libclc:/usr/share/pkgconfig/libclc.pc:/usr/lib/llvm/18/share/pkgconfig/libclc.pc
-"
-
-do_configure() {
- # We really do a native build.
- # The outcome is just header files.
- unset CC CXX LD CFLAGS CXXFLAGS LDFLAGS
- mkdir -p build
- cd build
- cmake -GNinja ${configure_args} ..
-}
-
-post_install() {
- vlicense LICENSE.TXT
-}
diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/lld-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/lldb-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm-bolt b/srcpkgs/llvm-bolt
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/llvm-bolt
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm-devel b/srcpkgs/llvm-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/llvm-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 18e3a5c4669957..69b15fbda277c5 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,50 +1,84 @@
# Template file for 'llvm'
pkgname=llvm
-version=17
-revision=5
+version=19
+revision=1
build_style=meta
depends="llvm${version}"
short_desc="LLVM meta package"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Public Domain"
homepage="https://www.voidlinux.org"
-replaces="llvm15>=0 llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
+replaces="llvm18>=0 llvm17>=0 llvm15>=0 llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0
+ llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
+
+llvm-devel_package() {
+ build_style=meta
+ replaces="llvm18-devel>=0 llvm17-devel>=0"
+ depends="llvm${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
+}
clang_package() {
build_style=meta
+ replaces="clang18>=0 clang17>=0"
depends="clang${version}>=0"
- short_desc+=" - clang"
+ short_desc+=" - ${pkgname}"
+}
+
+clang-devel_package() {
+ build_style=meta
+ replaces="clang18-devel>=0 clang17-devel>=0"
+ depends="clang${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
}
clang-tools-extra_package() {
build_style=meta
+ replaces="clang-tools-extra18>=0 clang-tools-extra17>=0"
depends="clang-tools-extra${version}>=0"
- short_desc+=" - clang-tools-extra"
+ short_desc+=" - ${pkgname}"
}
clang-analyzer_package() {
build_style=meta
+ replaces="clang-analyzer18>=0 clang-analyzer17>=0"
depends="clang-analyzer${version}>=0"
- short_desc+=" - clang-analyzer"
+ short_desc+=" - ${pkgname}"
}
lld_package() {
build_style=meta
+ replaces="lld18>=0 lld17>=0"
depends="lld${version}>=0"
- short_desc+=" - lld"
+ short_desc+=" - ${pkgname}"
+}
+
+lld-devel_package() {
+ build_style=meta
+ replaces="lld18-devel>=0 lld17-devel>=0"
+ depends="lld${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
}
lldb_package() {
build_style=meta
+ replaces="lldb18>=0 lldb17>=0"
depends="lldb${version}>=0"
- short_desc+=" - lldb"
+ short_desc+=" - ${pkgname}"
+}
+
+lldb-devel_package() {
+ build_style=meta
+ replaces="lldb18-devel>=0 lldb17-devel>=0"
+ depends="lldb${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
}
compiler-rt_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
depends="compiler-rt${version}>=0"
- short_desc+=" - compiler-rt"
+ short_desc+=" - ${pkgname}"
}
libclang_package() {
@@ -68,13 +102,58 @@ libllvm_package() {
libomp_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
+ replaces="libomp18>=0 libomp17>=0"
depends="libomp${version}>=0"
- short_desc+=" - transitional meta package"
+ short_desc+=" - ${pkgname}"
}
libomp-devel_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
+ replaces="libomp18-devel>=0 libomp17-devel>=0"
depends="libomp${version}-devel>=0"
- short_desc+=" - transitional meta package"
+ short_desc+=" - ${pkgname}"
+}
+
+mlir_package() {
+ build_style=meta
+ replaces="mlir18>=0 mlir17>=0"
+ depends="mlir${version}>=0"
+ short_desc+=" - ${pkgname}"
}
+
+mlir-devel_package() {
+ build_style=meta
+ replaces="mlir18-devel>=0 mlir17-devel>=0"
+ depends="mlir${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+flang_package() {
+ build_style=meta
+ replaces="flang18>=0 flang17>=0"
+ depends="flang${version}>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+flang-devel_package() {
+ build_style=meta
+ replaces="flang18-devel>=0 flang17-devel>=0"
+ depends="flang${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+llvm-bolt_package() {
+ build_style=meta
+ replaces="llvm-bolt18>=0 llvm-bolt17>=0"
+ depends="llvm-bolt${version}>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+libclc_package() {
+ build_style=meta
+ replaces="libclc-git>=0"
+ depends="libclc${version}>=0"
+ short_desc+=" - ${pkgname}"
+}
+
diff --git a/srcpkgs/mlir b/srcpkgs/mlir
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/mlir
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/mlir-devel b/srcpkgs/mlir-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/mlir-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
From 69b9384500e825dde20447d11620d98287383ea2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 23 Nov 2024 16:24:45 -0500
Subject: [PATCH 2/3] SPIRV-LLVM-Translator: update to 19.
---
common/shlibs | 1 -
srcpkgs/SPIRV-LLVM-Translator/template | 33 +++++++-------------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 828c6aa855e040..36f1ca12cd7a94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -999,7 +999,6 @@ libclang-cpp.so.17 libclang-cpp17-17.0.6_1
libLLVM-17.so libllvm17-17.0.6_1
libLLVM.so.18.1 libllvm18-18.1.8_1
libLLVM.so.19.1 libllvm19-19.1.0_1
-libLLVMSPIRVLib.so.18.1 SPIRV-LLVM-Translator-18.1.2_1
libLLVMSPIRVLib.so.19.1 SPIRV-LLVM-Translator19-19.1.1_1
libomp.so.5 libomp-17.0.6_1
libomptarget.so.18.1 libomp-18.1.8_1
diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template
index 8b9bd91ed79eee..e0322c1232f52e 100644
--- a/srcpkgs/SPIRV-LLVM-Translator/template
+++ b/srcpkgs/SPIRV-LLVM-Translator/template
@@ -1,33 +1,16 @@
# Template file for 'SPIRV-LLVM-Translator'
pkgname=SPIRV-LLVM-Translator
-version=18.1.3
+version=19
revision=1
-build_style=cmake
-configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
- -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON
- -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr"
-hostmakedepends="clang18 llvm18"
-makedepends="llvm18-devel SPIRV-Headers SPIRV-Tools-devel"
-short_desc="API and commands for processing SPIR-V modules"
+build_style=meta
+depends="SPIRV-LLVM-Translator${version}"
+short_desc="Bidirectional SPIR-V to LLVM Translator - meta package"
maintainer="Daniel Martinez <danielmartinez@cock.li>"
-license="NCSA"
-homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
-checksum=d896f35102c3ba9e16ead7b4db53b75e6131982cdb36a3324f17c68a43598759
-
-alternatives="llvm-spirv:llvm-spirv:/usr/bin/llvm-spirv-${version%.*.*}"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/llvm-spirv ${DESTDIR}/usr/bin/llvm-spirv-${version%.*.*}
- vlicense LICENSE.TXT
-}
+license="Public Domain"
+homepage="https://www.voidlinux.org"
SPIRV-LLVM-Translator-devel_package() {
- depends="SPIRV-LLVM-Translator-${version}_${revision}"
+ build_style=meta
+ depends="SPIRV-LLVM-Translator${version}-devel>=0"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
}
From 97c24266cdb003315ebc723f30231c69b2f76e9c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 23 Nov 2024 16:49:00 -0500
Subject: [PATCH 3/3] SPIRV-LLVM-Translator19: Remove conflicts
---
srcpkgs/SPIRV-LLVM-Translator19/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SPIRV-LLVM-Translator19/template b/srcpkgs/SPIRV-LLVM-Translator19/template
index 449accfe440ab3..2c05d8e1d4bee0 100644
--- a/srcpkgs/SPIRV-LLVM-Translator19/template
+++ b/srcpkgs/SPIRV-LLVM-Translator19/template
@@ -1,7 +1,7 @@
# Template file for 'SPIRV-LLVM-Translator19'
pkgname=SPIRV-LLVM-Translator19
version=19.1.1
-revision=1
+revision=2
_llvm_ver=${version%%.*}
build_style=cmake
configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
@@ -27,7 +27,7 @@ post_install() {
SPIRV-LLVM-Translator19-devel_package() {
depends="SPIRV-LLVM-Translator${_llvm_ver}-${version}_${revision}"
- conflicts="SPIRV-LLVM-Translator-devel>=0"
+ conflicts="SPIRV-LLVM-Translator-devel<=18.1.3_1"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Llvm metapkg
2024-11-23 21:28 [PR PATCH] Llvm metapkg Calandracas606
2024-11-23 21:51 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-11-23 21:53 ` Calandracas606
1 sibling, 0 replies; 3+ messages in thread
From: Calandracas606 @ 2024-11-23 21:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages llvm-metapkg
https://github.com/void-linux/void-packages/pull/53198
Llvm metapkg
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53198.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-llvm-metapkg-53198.patch --]
[-- Type: text/x-diff, Size: 12144 bytes --]
From 27ca2097fc9476cb88415ca4dc45b1ad52e5c555 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 23 Nov 2024 16:10:38 -0500
Subject: [PATCH 1/3] llvm: update to 19.
---
srcpkgs/clang-devel | 1 +
srcpkgs/flang | 1 +
srcpkgs/flang-devel | 1 +
srcpkgs/libclc | 1 +
srcpkgs/libclc/template | 36 ---------------
srcpkgs/lld-devel | 1 +
srcpkgs/lldb-devel | 1 +
srcpkgs/llvm-bolt | 1 +
srcpkgs/llvm-devel | 1 +
srcpkgs/llvm/template | 100 +++++++++++++++++++++++++++++++++++-----
srcpkgs/mlir | 1 +
srcpkgs/mlir-devel | 1 +
12 files changed, 99 insertions(+), 47 deletions(-)
create mode 120000 srcpkgs/clang-devel
create mode 120000 srcpkgs/flang
create mode 120000 srcpkgs/flang-devel
create mode 120000 srcpkgs/libclc
delete mode 100644 srcpkgs/libclc/template
create mode 120000 srcpkgs/lld-devel
create mode 120000 srcpkgs/lldb-devel
create mode 120000 srcpkgs/llvm-bolt
create mode 120000 srcpkgs/llvm-devel
create mode 120000 srcpkgs/mlir
create mode 120000 srcpkgs/mlir-devel
diff --git a/srcpkgs/clang-devel b/srcpkgs/clang-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/clang-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/flang b/srcpkgs/flang
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/flang
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/flang-devel b/srcpkgs/flang-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/flang-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/libclc b/srcpkgs/libclc
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/libclc
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
deleted file mode 100644
index 63d5a06fa2bb7d..00000000000000
--- a/srcpkgs/libclc/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'libclc'
-pkgname=libclc
-version=18.1.8
-revision=3
-build_style=cmake
-# disable clspv (failing tests, we don't ship it)
-configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm/18/ -DCMAKE_BUILD_TYPE=Release
- -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-"
-hostmakedepends="llvm18-devel python3 libedit-devel libffi-devel
- ncurses-devel zlib-devel SPIRV-LLVM-Translator"
-short_desc="Open implementation of the OpenCL C programming language"
-maintainer="Daniel Martinez <danielmartinez@cock.li>"
-license="BSD-3-Clause, MIT"
-homepage="https://libclc.llvm.org"
-distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz"
-checksum=905bd59e9f810d6bd0ae6874725a8f8a3c91cb416199c03f2b98b57437cfb32e
-replaces="libclc-git>=0"
-
-alternatives="
- libclc:/usr/share/clc:/usr/lib/llvm/18/share/clc
- libclc:/usr/include/clc:/usr/lib/llvm/18/include/clc
- libclc:/usr/share/pkgconfig/libclc.pc:/usr/lib/llvm/18/share/pkgconfig/libclc.pc
-"
-
-do_configure() {
- # We really do a native build.
- # The outcome is just header files.
- unset CC CXX LD CFLAGS CXXFLAGS LDFLAGS
- mkdir -p build
- cd build
- cmake -GNinja ${configure_args} ..
-}
-
-post_install() {
- vlicense LICENSE.TXT
-}
diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/lld-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/lldb-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm-bolt b/srcpkgs/llvm-bolt
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/llvm-bolt
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm-devel b/srcpkgs/llvm-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/llvm-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 18e3a5c4669957..aef0692e3cd928 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,50 +1,84 @@
# Template file for 'llvm'
pkgname=llvm
-version=17
-revision=5
+version=19
+revision=1
build_style=meta
depends="llvm${version}"
short_desc="LLVM meta package"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Public Domain"
homepage="https://www.voidlinux.org"
-replaces="llvm15>=0 llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
+replaces="llvm18>=0 llvm17>=0 llvm15>=0 llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0
+ llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
+
+llvm-devel_package() {
+ build_style=meta
+ replaces="llvm18-devel>=0 llvm17-devel>=0"
+ depends="llvm${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
+}
clang_package() {
build_style=meta
+ replaces="clang18>=0 clang17>=0"
depends="clang${version}>=0"
- short_desc+=" - clang"
+ short_desc+=" - ${pkgname}"
+}
+
+clang-devel_package() {
+ build_style=meta
+ replaces="clang18-devel>=0 clang17-devel>=0"
+ depends="clang${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
}
clang-tools-extra_package() {
build_style=meta
+ replaces="clang-tools-extra18>=0 clang-tools-extra17>=0"
depends="clang-tools-extra${version}>=0"
- short_desc+=" - clang-tools-extra"
+ short_desc+=" - ${pkgname}"
}
clang-analyzer_package() {
build_style=meta
+ replaces="clang-analyzer18>=0 clang-analyzer17>=0"
depends="clang-analyzer${version}>=0"
- short_desc+=" - clang-analyzer"
+ short_desc+=" - ${pkgname}"
}
lld_package() {
build_style=meta
+ replaces="lld18>=0 lld17>=0"
depends="lld${version}>=0"
- short_desc+=" - lld"
+ short_desc+=" - ${pkgname}"
+}
+
+lld-devel_package() {
+ build_style=meta
+ replaces="lld18-devel>=0 lld17-devel>=0"
+ depends="lld${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
}
lldb_package() {
build_style=meta
+ replaces="lldb18>=0 lldb17>=0"
depends="lldb${version}>=0"
- short_desc+=" - lldb"
+ short_desc+=" - ${pkgname}"
+}
+
+lldb-devel_package() {
+ build_style=meta
+ replaces="lldb18-devel>=0 lldb17-devel>=0"
+ depends="lldb${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
}
compiler-rt_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
depends="compiler-rt${version}>=0"
- short_desc+=" - compiler-rt"
+ short_desc+=" - ${pkgname}"
}
libclang_package() {
@@ -68,13 +102,57 @@ libllvm_package() {
libomp_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
+ replaces="libomp18>=0 libomp17>=0"
depends="libomp${version}>=0"
- short_desc+=" - transitional meta package"
+ short_desc+=" - ${pkgname}"
}
libomp-devel_package() {
reverts="17.0.6_1 17.0.6_2"
build_style=meta
+ replaces="libomp18-devel>=0 libomp17-devel>=0"
depends="libomp${version}-devel>=0"
- short_desc+=" - transitional meta package"
+ short_desc+=" - ${pkgname}"
+}
+
+mlir_package() {
+ build_style=meta
+ replaces="mlir18>=0 mlir17>=0"
+ depends="mlir${version}>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+mlir-devel_package() {
+ build_style=meta
+ replaces="mlir18-devel>=0 mlir17-devel>=0"
+ depends="mlir${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+flang_package() {
+ build_style=meta
+ replaces="flang18>=0 flang17>=0"
+ depends="flang${version}>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+flang-devel_package() {
+ build_style=meta
+ replaces="flang18-devel>=0 flang17-devel>=0"
+ depends="flang${version}-devel>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+llvm-bolt_package() {
+ build_style=meta
+ replaces="llvm-bolt18>=0 llvm-bolt17>=0"
+ depends="llvm-bolt${version}>=0"
+ short_desc+=" - ${pkgname}"
+}
+
+libclc_package() {
+ build_style=meta
+ replaces="libclc-git>=0"
+ depends="libclc${version}>=0"
+ short_desc+=" - ${pkgname}"
}
diff --git a/srcpkgs/mlir b/srcpkgs/mlir
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/mlir
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
diff --git a/srcpkgs/mlir-devel b/srcpkgs/mlir-devel
new file mode 120000
index 00000000000000..0d68131b9b3088
--- /dev/null
+++ b/srcpkgs/mlir-devel
@@ -0,0 +1 @@
+llvm
\ No newline at end of file
From 993b628171267b2d01cd7d3bfceeebc9f189dec6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 23 Nov 2024 16:24:45 -0500
Subject: [PATCH 2/3] SPIRV-LLVM-Translator: update to 19.
---
common/shlibs | 1 -
srcpkgs/SPIRV-LLVM-Translator/template | 33 +++++++-------------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 828c6aa855e040..36f1ca12cd7a94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -999,7 +999,6 @@ libclang-cpp.so.17 libclang-cpp17-17.0.6_1
libLLVM-17.so libllvm17-17.0.6_1
libLLVM.so.18.1 libllvm18-18.1.8_1
libLLVM.so.19.1 libllvm19-19.1.0_1
-libLLVMSPIRVLib.so.18.1 SPIRV-LLVM-Translator-18.1.2_1
libLLVMSPIRVLib.so.19.1 SPIRV-LLVM-Translator19-19.1.1_1
libomp.so.5 libomp-17.0.6_1
libomptarget.so.18.1 libomp-18.1.8_1
diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template
index 8b9bd91ed79eee..e0322c1232f52e 100644
--- a/srcpkgs/SPIRV-LLVM-Translator/template
+++ b/srcpkgs/SPIRV-LLVM-Translator/template
@@ -1,33 +1,16 @@
# Template file for 'SPIRV-LLVM-Translator'
pkgname=SPIRV-LLVM-Translator
-version=18.1.3
+version=19
revision=1
-build_style=cmake
-configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
- -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON
- -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr"
-hostmakedepends="clang18 llvm18"
-makedepends="llvm18-devel SPIRV-Headers SPIRV-Tools-devel"
-short_desc="API and commands for processing SPIR-V modules"
+build_style=meta
+depends="SPIRV-LLVM-Translator${version}"
+short_desc="Bidirectional SPIR-V to LLVM Translator - meta package"
maintainer="Daniel Martinez <danielmartinez@cock.li>"
-license="NCSA"
-homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
-checksum=d896f35102c3ba9e16ead7b4db53b75e6131982cdb36a3324f17c68a43598759
-
-alternatives="llvm-spirv:llvm-spirv:/usr/bin/llvm-spirv-${version%.*.*}"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/llvm-spirv ${DESTDIR}/usr/bin/llvm-spirv-${version%.*.*}
- vlicense LICENSE.TXT
-}
+license="Public Domain"
+homepage="https://www.voidlinux.org"
SPIRV-LLVM-Translator-devel_package() {
- depends="SPIRV-LLVM-Translator-${version}_${revision}"
+ build_style=meta
+ depends="SPIRV-LLVM-Translator${version}-devel>=0"
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
}
From 3ca05a389f0de135a6693edcb2f34e83e6acaa87 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 23 Nov 2024 16:49:00 -0500
Subject: [PATCH 3/3] SPIRV-LLVM-Translator19: Remove conflicts
---
srcpkgs/SPIRV-LLVM-Translator19/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SPIRV-LLVM-Translator19/template b/srcpkgs/SPIRV-LLVM-Translator19/template
index 449accfe440ab3..2c05d8e1d4bee0 100644
--- a/srcpkgs/SPIRV-LLVM-Translator19/template
+++ b/srcpkgs/SPIRV-LLVM-Translator19/template
@@ -1,7 +1,7 @@
# Template file for 'SPIRV-LLVM-Translator19'
pkgname=SPIRV-LLVM-Translator19
version=19.1.1
-revision=1
+revision=2
_llvm_ver=${version%%.*}
build_style=cmake
configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
@@ -27,7 +27,7 @@ post_install() {
SPIRV-LLVM-Translator19-devel_package() {
depends="SPIRV-LLVM-Translator${_llvm_ver}-${version}_${revision}"
- conflicts="SPIRV-LLVM-Translator-devel>=0"
+ conflicts="SPIRV-LLVM-Translator-devel<=18.1.3_1"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-23 21:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-23 21:28 [PR PATCH] Llvm metapkg Calandracas606
2024-11-23 21:51 ` [PR PATCH] [Updated] " Calandracas606
2024-11-23 21:53 ` 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).