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

commit c072428ed778944e5fea240e16b6b448e21eb336
Author: Efraim Flashner <[email protected]>
AuthorDate: Fri May 30 11:15:54 2025 +0300

    gnu: cppdap: Fix build on riscv64-linux.
    
    * gnu/packages/debug.scm (cppdap)[arguments]: When building for
    riscv64-linux add a configure-flag to link with latomic.
    
    Change-Id: I1ff388ac5551270b8c12fa6a62231a86200e024a
---
 gnu/packages/debug.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 3e86564e18..d558cbd503 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016, 2017, 2019-2022 Eric Bavier 
<[email protected]>
-;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner 
<[email protected]>
+;;; Copyright © 2016-2018, 2020, 2021, 2025 Efraim Flashner 
<[email protected]>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <[email protected]>
 ;;; Copyright © 2018, 2019 Rutger Helling <[email protected]>
 ;;; Copyright © 2019 Pkill -9 <[email protected]>
@@ -220,7 +220,10 @@ tools that process C/C++ code.")
          ;; Only one of the following three can be enabled at the same time
          ;; "-DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=ON"
          ;; "-DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=ON"
-         "-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON")))
+         "-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON"
+         #$@(if (target-riscv64?)
+                '("-DCMAKE_EXE_LINKER_FLAGS=-latomic")
+                '()))))
     (native-inputs
      (list googletest))
     ;; see lib/cmake/cppdap/cppdapConfig.cmake

Reply via email to