mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-24 03:29:40 -05:00
gnu: rr: Update to 5.4.0.
* gnu/packages/debug.scm (rr): Update to 5.4.0. [arguments]: Add capnproto to the RUNPATH.
This commit is contained in:
parent
00781cb57d
commit
968b1a3ea2
1 changed files with 8 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
|
;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
|
||||||
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||||
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
|
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
|
||||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||||
|
@ -566,7 +566,7 @@ (define-public remake
|
||||||
(define-public rr
|
(define-public rr
|
||||||
(package
|
(package
|
||||||
(name "rr")
|
(name "rr")
|
||||||
(version "5.3.0")
|
(version "5.4.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -574,18 +574,19 @@ (define-public rr
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64"))
|
"1sfldgkkmsdyaqa28i5agcykc63gwm3zjihd64g86i852w8al2w6"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
;; The 'rr_exec_stub' is a static binary, which leads CMake to fail
|
;; The 'rr_exec_stub' is a static binary, which leads CMake to fail
|
||||||
;; with:
|
;; with ‘file RPATH_CHANGE could not write new RPATH: ...’.
|
||||||
;;
|
|
||||||
;; file RPATH_CHANGE could not write new RPATH:
|
|
||||||
;;
|
|
||||||
;; Clear CMAKE_INSTALL_RPATH to avoid that problem.
|
;; Clear CMAKE_INSTALL_RPATH to avoid that problem.
|
||||||
(list "-DCMAKE_INSTALL_RPATH="
|
(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))
|
,@(if (and (not (%current-target-system))
|
||||||
(member (%current-system)
|
(member (%current-system)
|
||||||
'("x86_64-linux" "aarch64-linux")))
|
'("x86_64-linux" "aarch64-linux")))
|
||||||
|
|
Loading…
Reference in a new issue