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.

Sign up for GitHub

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

Jump to bottom

rust: build with llvm19 #53197

Merged
merged 1 commit into from
Nov 24, 2024
Merged

rust: build with llvm19 #53197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions srcpkgs/rust/patches/0015-properly-skip-submodules.patch
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions srcpkgs/rust/template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
#
pkgname=rust
version=1.82.0
revision=1
revision=2
_llvmver=19
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm18-devel"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm${_llvmver}-devel"
depends="rust-std gcc"
short_desc="Safe, concurrent, practical systems language"
maintainer="Enno Boland <[email protected]>"
Expand All @@ -23,6 +24,7 @@ lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src

build_helper="qemu"
build_options="bindist"
desc_option_bindist="Generate tarballs for bootstrap"

Expand All @@ -34,7 +36,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi

if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" rust llvm18-devel"
hostmakedepends+=" rust llvm${_llvmver}-devel"
# These are required for building the buildhost's stage0/1
hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel"
else
Expand All @@ -49,7 +51,6 @@ _clear_vendor_checksums() {
}

post_patch() {
rm -rf src/llvm-project
if [ "$build_option_bindist" ]; then
for x in ${FILESDIR}/patches/static-llvm/*.patch; do
msg_normal "Applying patch $x\n"
Expand Down Expand Up @@ -96,7 +97,7 @@ do_configure() {
fi

if [ "$CROSS_BUILD" ]; then
_cross_args="--set=target.${RUST_TARGET}.llvm-config=/usr/bin/llvm-config
_cross_args="--set=target.${RUST_TARGET}.llvm-config=${XBPS_WRAPPERDIR}/llvm-config-qemu
--set=target.${RUST_TARGET}.crt-static=false
--set=target.${RUST_TARGET}.cc=${CC}
--set=target.${RUST_TARGET}.cxx=${CXX}
Expand Down
Loading