[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#73071] [PATCH mesa-updates 7/8] gnu: llvm-for-mesa: Build all targe
From: |
John Kehayias |
Subject: |
[bug#73071] [PATCH mesa-updates 7/8] gnu: llvm-for-mesa: Build all targets. |
Date: |
Fri, 06 Sep 2024 15:07:59 +0000 |
This change is needed for updating mesa to 24.2.1. Otherwise, mesa fails to
build. For example, linking intel_clc fails with errors of libclang-cpp.so
having undefined references to various LLVM targets.
It is possible that just some LLVM targets could be built or a modified
version of the clang input for mesa (now required) could be used to try to
reduce the closure size as before.
* gnu/packages/llvm.scm (llvm-for-mesa)[arguments]: Don't set the
LLVM_TARGETS_TO_BUILD configure flag. Also, don't remove it from the
inherited configure-flags. Fix indentation.
Change-Id: I4a2b7239e6ea77b0d3bce10bdf945691faa84994
---
gnu/packages/llvm.scm | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 7fcb15891d..800fe29599 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -22,7 +22,7 @@
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022, 2024 Greg Hogan <code@greghogan.com>
-;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2022, 2024 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
@@ -2166,21 +2166,18 @@ (define-public llvm-for-mesa
,@modules))
((#:configure-flags cf ''())
#~(cons*
- ;; AMDGPU is needed by the vulkan drivers.
- #$(string-append "-DLLVM_TARGETS_TO_BUILD="
- (system->llvm-target) ";AMDGPU")
- #$@(if (%current-target-system)
- '("-DBUILD_SHARED_LIBS:BOOL=TRUE"
- "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
+ #$@(if (%current-target-system)
+ '("-DBUILD_SHARED_LIBS:BOOL=TRUE"
+ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
'())
- ;; Skipping tools and utils decreases the output by ~100 MiB.
- "-DLLVM_BUILD_TOOLS=NO"
- (remove
- (cut string-match
- #$(if (%current-target-system)
-
"-DLLVM_(LINK_LLVM_DYLIB|TARGETS_TO_BUILD|INSTALL_UTILS).*"
- "-DLLVM_(TARGETS_TO_BUILD|INSTALL_UTILS).*") <>)
- #$cf)))
+ ;; Skipping tools and utils decreases the output by ~100 MiB.
+ "-DLLVM_BUILD_TOOLS=NO"
+ (remove
+ (cut string-match
+ #$(if (%current-target-system)
+ "-DLLVM_(LINK_LLVM_DYLIB|INSTALL_UTILS).*"
+ "-DLLVM_INSTALL_UTILS.*") <>)
+ #$cf)))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
#$@(if (%current-target-system)
--
2.45.2
- [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2, John Kehayias, 2024/09/06
- [bug#73071] [PATCH mesa-updates 1/8] gnu: libdrm: Update to 2.4.123., John Kehayias, 2024/09/06
- [bug#73071] [PATCH mesa-updates 4/8] gnu: vulkan-headers: Hard-code libvulkan.so file name., John Kehayias, 2024/09/06
- [bug#73071] [PATCH mesa-updates 6/8] gnu: llvm-for-mesa: Update to llvm-18., John Kehayias, 2024/09/06
- [bug#73071] [PATCH mesa-updates 3/8] gnu: Remove wayland-protocols-next., John Kehayias, 2024/09/06
- [bug#73071] [PATCH mesa-updates 5/8] gnu: volk: Hard-code path of vulkan-loader for dynamic loading, John Kehayias, 2024/09/06
- [bug#73071] [PATCH mesa-updates 7/8] gnu: llvm-for-mesa: Build all targets.,
John Kehayias <=
- [bug#73071] [PATCH mesa-updates 8/8] gnu: mesa: Update to 24.2.2., John Kehayias, 2024/09/06
- [bug#73071] [PATCH mesa-updates 2/8] gnu: wayland-protocols: Update to 1.37., John Kehayias, 2024/09/06
- [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2, John Kehayias, 2024/09/08
- [bug#73071] [PATCH mesa-updates] gnu: mesa: Enable NVK driver for x86_64 architecture., aurtzy, 2024/09/09
- [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2, The Man, 2024/09/17
- [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2, John Kehayias, 2024/09/19