From adeb7e4d1fa332e0b145fa6e84b0c51c70a66b6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 20 Feb 2025 19:23:46 +0200 Subject: [PATCH] gnu: liburcu: Fix build on riscv64-linux. * gnu/packages/datastructures.scm (liburcu)[native-inputs]: When building for riscv64-linux add gcc-14. Change-Id: Id27fd66938076a37f60a98a2649e7f9d9fa97b85 --- gnu/packages/datastructures.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 84e9edb52d4..30a8189a895 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2018, 2019, 2023 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Meiyo Peng -;;; Copyright © 2019, 2020, 2022 Efraim Flashner +;;; Copyright © 2019, 2020, 2022, 2024, 2025 Efraim Flashner ;;; Copyright © 2020 Mark H Weaver ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2023 Nicolas Goaziou @@ -27,11 +27,13 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) + #:use-module (gnu packages gcc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -224,7 +226,12 @@ allows multiple concurrent reader and writer threads.") "1h5bg0k94by2v7cjq7fb3ridqixbd9pndw506vl27h3fvh9wn6i3")))) (build-system gnu-build-system) (native-inputs - (list perl)) ; for tests + ;; riscv64 needs >= gcc-13.3.0 + (append + (if (target-riscv64?) + (list gcc-14) + '()) + (list perl))) ; for tests (home-page "https://liburcu.org/") (synopsis "User-space RCU data synchronisation library") (description "liburcu is a user-space @dfn{Read-Copy-Update} (RCU) data