guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/08: gnu: glslang: Fix building on riscv64-linux.


From: guix-commits
Subject: 01/08: gnu: glslang: Fix building on riscv64-linux.
Date: Sun, 7 Apr 2024 08:08:05 -0400 (EDT)

efraim pushed a commit to branch mesa-updates
in repository guix.

commit 8ecd6af8f6d9a41651213a121e11d49a1ec40e7a
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Apr 4 16:26:50 2024 +0300

    gnu: glslang: Fix building on riscv64-linux.
    
    * gnu/packages/vulkan.scm (glslang)[arguments]: When building for
    riscv64-linux add a configure-flag to link against -latomic.
    
    Change-Id: Ibf8dd0cac71e19f09ad730d88ddd5c8f7b44c14e
---
 gnu/packages/vulkan.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index d9b364dfd1..997e653010 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
 ;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
@@ -200,8 +200,11 @@ translation between LLVM IR and SPIR-V.")
        (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
-     '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"
-                           "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON")
+     `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"
+                           "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON"
+                           ,@(if (target-riscv64?)
+                                 `("-DCMAKE_EXE_LINKER_FLAGS=-latomic")
+                                 '()))
        #:phases (modify-phases %standard-phases
                   (replace 'check
                     (lambda* (#:key tests? #:allow-other-keys)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]