Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LLVM 15 #40821

Closed
wants to merge 26 commits into from
Closed

LLVM 15 #40821

wants to merge 26 commits into from

Conversation

tranzystorekk
Copy link
Contributor

@tranzystorekk tranzystorekk commented Nov 28, 2022

[ci skip]

TODO:

  • Adjust patches marked as .patch.skip dropped support for ppc
  • Make libomp a shlib (change so file name and install a symlink)
  • Avoid creating triplet dirs under /usr/
  • Fix arm 32bit build LLVM 15 #40821 (comment)

TODO LLVM rdeps:

@tranzystorekk
Copy link
Contributor Author

For now working on top of #34902

@dkwo
Copy link
Contributor

dkwo commented Nov 28, 2022

You may want to look at the previous PR (for 14) for inspiration, as well as chimera and alpine for patches.
Some stuff will need rebuild (e.g. mesa), and maybe update zig to 10.

@Vaelatern
Copy link
Member

Vaelatern commented Dec 7, 2022

diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index 728c5a64e9d..f453348a7a0 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -1,7 +1,7 @@
 # Template file for 'zig'
 pkgname=zig
-version=0.8.1
-revision=2
+version=0.10.0
+revision=1
 archs="x86_64* aarch64*"
 build_style=cmake
 make_cmd=make
@@ -11,7 +11,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://ziglang.org"
 distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz"
-checksum=8c428e14a0a89cb7a15a6768424a37442292858cdb695e2eb503fa3c7bf47f1a
+checksum=d8409f7aafc624770dcd050c8fa7e62578be8e6a10956bca3c86e8531c64c136
 nopie=yes
 nocross=yes

Could use the update and needs llvm 15.

srcpkgs/llvm15/template Outdated Show resolved Hide resolved
@oreo639
Copy link
Member

oreo639 commented Dec 19, 2022

Here is a patch to fix building on musl:
https://gist.github.com/oreo639/a43b23916774fe58910bffce6a848190

It includes a patch that partially reverts:
https://reviews.llvm.org/D124227

That is necessary to fix usage of abi_tag() on an extern "C" declaration which is explicitly not allowed in gcc:
https://github.com/gcc-mirror/gcc/blob/master/gcc/cp/tree.cc#L5350-L5355

This also disables GWP-ASan/-fsanitize=scudo on musl since it depends on libexecinfo (which doesn't work correctly) and GWP-ASan also gets into an infinite loop on musl.

@simvux
Copy link

simvux commented Dec 22, 2022

I believe this is required for mesa to work correctly with the new rx 7000s series amd GPU's. So to make them plug ń play we'll need to both merge this and swap the depedency in mesa from llvm to llvm15.

FWIW; merging this branch into #41084 and changing #41084 to llvm15 worked for me, but I also needed to fetch the latest linux-firmware-amd blobs, update SPIRV-{Headers,LLVM-Translator}, hack some stuff into shlibs which I'm not familiar with.

@oreo639
Copy link
Member

oreo639 commented Dec 22, 2022

llvm is llvm15 in this PR. mesa just needs to be rebuilt.

@ardadem
Copy link
Contributor

ardadem commented Dec 22, 2022

SPIRV-LLVM-Translator should match the llvm version so please update that as well.

@dkwo
Copy link
Contributor

dkwo commented Jan 10, 2023

Perhaps it's better to also update river and waylock.
I've been using them with static zig for a while, with no issues. Just for reference:

 # Template file for 'river'
 pkgname=river
-version=0.1.1
-revision=2
+version=0.2.2
+revision=1
 build_style=zig-build
-configure_args="$(vopt_if xwayland -Dxwayland)"
+configure_args="$(vopt_if xwayland -Dxwayland) -Dpie -Dstrip"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots0.15-devel libevdev-devel"
+makedepends="wlroots-devel libevdev-devel pixman-devel
+ wayland-protocols"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/riverwm/river"
 distfiles="${homepage}/releases/download/v${version}/river-${version}.tar.gz"
-checksum=2a0bcd4670ed9ebd39c279f2bf10803fc65c9f3ee2307ce40728df23ce914d18
+checksum=99c256c6b1461d9beeff95fae0db54403e2b12f96e4c959ddbcaeae73fd89091

 build_options="xwayland"
 build_options_default="xwayland"

with no patch, as well as

 # Template file for 'waylock'
 pkgname=waylock
-version=0.3.5
+version=0.6.1
 revision=1
-build_style=cargo
+build_style=zig-build
+configure_args="-Dpie -Dstrip -Drelease-safe"
 hostmakedepends="pkg-config"
-makedepends="libxkbcommon-devel pam-devel"
+makedepends="libxkbcommon-devel pam-devel wayland-protocols wayland-devel scdoc"
 short_desc="Simple screenlocker for wayland compositors"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
-license="MIT"
+license="ISC"
 homepage="https://github.com/ifreund/waylock"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=60abf78ae8aa9c28f3230f157607fbd74250a51322776ad1b7abed1408432b87
+distfiles="https://github.com/ifreund/waylock/releases/download/v${version}/waylock-${version}.tar.gz"
+checksum=4d3fc46b0f48c964362fdfceff27314a87b28cb3c40fbf782d24ca755bfa8c55
 
 post_install() {
        vlicense LICENSE

@Johnnynator

This comment was marked as resolved.

@simvux
Copy link

simvux commented Apr 2, 2023

@tranzystorek-io @leahneukirchen the build of LLVM15 & Friends failed and the active LLVM version in the xbps repository is still 12 even though it's been 15 in the github repository for days. Is this a known problem right now?

@tranzystorekk
Copy link
Contributor Author

@simvux this is a problem with repo-default, it hasn't been syncing up properly for sometime, to work around switch to repo-de

@simvux
Copy link

simvux commented Apr 2, 2023

ah i see, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.