From 968b1a3ea24435167efb9cee6c4debc6d18bfd96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 02:13:27 +0100 Subject: gnu: rr: Update to 5.4.0. * gnu/packages/debug.scm (rr): Update to 5.4.0. [arguments]: Add capnproto to the RUNPATH. --- gnu/packages/debug.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 3fe5fd07b3..b3a000e6e3 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020 Vincent Legoll @@ -566,7 +566,7 @@ (define-public remake (define-public rr (package (name "rr") - (version "5.3.0") + (version "5.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -574,18 +574,19 @@ (define-public rr (commit version))) (sha256 (base32 - "1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64")) + "1sfldgkkmsdyaqa28i5agcykc63gwm3zjihd64g86i852w8al2w6")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:configure-flags ;; The 'rr_exec_stub' is a static binary, which leads CMake to fail - ;; with: - ;; - ;; file RPATH_CHANGE could not write new RPATH: - ;; + ;; with ‘file RPATH_CHANGE could not write new RPATH: ...’. ;; Clear CMAKE_INSTALL_RPATH to avoid that problem. (list "-DCMAKE_INSTALL_RPATH=" + ;; Satisfy the ‘validate-runpath’ phase. This isn't a direct + ;; consequence of clearing CMAKE_INSTALL_RPATH. + (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" + (assoc-ref %build-inputs "capnproto") "/lib") ,@(if (and (not (%current-target-system)) (member (%current-system) '("x86_64-linux" "aarch64-linux"))) -- cgit v1.2.3